Do not use "bulletproof" but rather "default" for fallback.
grr conflicts
Security fixes and
Merge branch 'master' of github.com:s9y/Serendipity

Conflicts:
	docs/NEWS
Merge branch 'master' of github.com:s9y/Serendipity