PHPBookmarks commit v1
Merge branch 'master' of github.com:badimalex/php1