Merge branch 'master' into stable
tree4d30240af3098ab3bf8b6862b412373f988ab2ea
-rw-r--r-- 67 .gitattributes
-rw-r--r-- 997 .gitignore
-rw-r--r-- 1509 .htaccess.dist
-rw-r--r-- 18092 COPYING
-rw-r--r-- 306 README
-rw-r--r-- 25 VERSION
drwxr-xr-x - _cs
drwxr-xr-x - _test
drwxr-xr-x - bin
drwxr-xr-x - conf
drwxr-xr-x - data
-rw-r--r-- 2319 doku.php
-rw-r--r-- 18860 feed.php
drwxr-xr-x - inc
-rw-r--r-- 182 index.php
-rw-r--r-- 20108 install.php
drwxr-xr-x - lib