Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 Conflicts: docs/NEWS
8da4c647a8
0ffd02c
60e15aa