upport (from falks 1.7-2.0-merge)
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0