Merge branch 'master' of github.com:splitbrain/dokuwiki
commit1e542e417725bb148253929fac9146832d978e45
authorGuy Brand <gb@unistra.fr>
Tue, 12 Jul 2011 17:45:12 +0000 (12 19:45 +0200)
committerGuy Brand <gb@unistra.fr>
Tue, 12 Jul 2011 17:45:12 +0000 (12 19:45 +0200)
treee819b734e24a3fb1a40da50383dfbaf34ba3b1d6
parentb704da0446180981f7b286604f732155a76306f7
parenta1dee2b998bc3dc8436bb076435d405ec412e054
Merge branch 'master' of github.com:splitbrain/dokuwiki