Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Merge branch 'master' of github.com:eugeneai/dokuwiki