Merge branch 'master' of github.com:splitbrain/dokuwiki

inc/common.php

inc/init.php

inc/lang/zh/lang.php

inc/mail.php

inc/media.php

inc/template.php

lib/images/fileicons/gif.png

lib/images/fileicons/html.png

lib/images/fileicons/jpg.png

lib/images/fileicons/odg.png

lib/images/fileicons/odp.png

lib/images/fileicons/ods.png

lib/images/fileicons/png.png

lib/images/fileicons/sxc.png

lib/images/fileicons/sxd.png

lib/images/fileicons/sxw.png

lib/images/fileicons/tgz.png

lib/plugins/acl/lang/zh/lang.php

lib/plugins/config/admin.php

lib/plugins/config/lang/zh/lang.php