Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-master
commit6c006c18470a30c51ba724c37d7abd863efe43d3
authorGuy Brand <gb@unistra.fr>
Sat, 16 Apr 2011 13:24:51 +0000 (16 15:24 +0200)
committerGuy Brand <gb@unistra.fr>
Sat, 16 Apr 2011 13:24:51 +0000 (16 15:24 +0200)
tree369db3cbdae7e00b6d20d2828d3f8ad7d68398a4
parentff9a8d11b604e75395a9dd4d0d3700653a2adf1f
parentd8f5fe8a1b2231ff584f43c25217b16950600656
Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-master