splitbrain/dokuwiki — pull request #581 by Chris--S (2014-03-02 21:05:26+00:00)
Title: FS#2388 merged

fixed merging issues