flammy/dokuwiki — pull request #2 by flammy (2014-03-06 22:49:24+00:00)
Title: Merged Master into Flammy: patch-4 via Github GUI

Merged Master into Flammy: patch-4 via Github GUI