Garvin Hicking 2f631807fe Fix conflicts.
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	docs/NEWS
2014-12-19 09:56:10 +01:00
..
2006-08-02 10:07:34 +00:00
2007-10-16 08:08:43 +00:00
2014-12-19 09:56:10 +01:00
2006-08-02 10:07:34 +00:00
2006-08-02 10:07:34 +00:00
2012-01-03 22:24:32 +01:00
2006-08-02 10:07:34 +00:00

########################################################################
# README                                                               #
########################################################################

For the most up-to-date information on documentation, creating styles,
plugins and so on, please visit our Wiki on http://www.s9y.org/!