Merge branch master into stable
tree0377662d2335a0e2160175d5be3b95a92f6bb332
-rw-r--r-- 997 .gitignore
-rw-r--r-- 1509 .htaccess.dist
-rw-r--r-- 18092 COPYING
-rw-r--r-- 306 README
-rw-r--r-- 28 VERSION
drwxr-xr-x - _cs
drwxr-xr-x - _test
drwxr-xr-x - bin
drwxr-xr-x - conf
drwxr-xr-x - data
-rw-r--r-- 2321 doku.php
-rw-r--r-- 18750 feed.php
drwxr-xr-x - inc
-rw-r--r-- 182 index.php
-rw-r--r-- 19664 install.php
drwxr-xr-x - lib