merge + merge-test
Merge branch 'master' of github.com:sh0w/serendipity

merged
test: check successfull merge
Favicon, Logo
solved merge conflicts