Garvin Hicking 40aaef8313 Security fixes and
Merge branch 'master' of github.com:s9y/Serendipity

Conflicts:
	docs/NEWS
2014-02-06 09:38:05 +01:00
..
2014-02-06 09:38:05 +01:00
2011-11-24 12:16:02 +01:00
2013-06-09 20:07:28 +02:00
2008-12-09 10:41:48 +00:00
2014-02-06 09:38:05 +01:00