Merge https://github.com/akate/dokuwiki into akate-058f1c3
commit6929b6c18094af743f690e8e5b1f7c70b483854d
authorGuy Brand <gb@unistra.fr>
Mon, 18 Apr 2011 19:48:47 +0000 (18 21:48 +0200)
committerGuy Brand <gb@unistra.fr>
Mon, 18 Apr 2011 19:48:47 +0000 (18 21:48 +0200)
tree85f702795fa62c1ffe813acdbdb8dd4ccdfd89ac
parent1f663d37c117a05d8343a100b7fac1736d24512c
parentf493983cbddc6c8c387a76bf3f6631853485162b
Merge https://github.com/akate/dokuwiki into akate-058f1c3