Merge branch 'master' into stable
treea5c787e4d87313a7fb6f18cb4c78bf210d92d60c
-rw-r--r-- 997 .gitignore
-rw-r--r-- 1525 .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-- 2287 doku.php
-rw-r--r-- 18590 feed.php
drwxr-xr-x - inc
-rw-r--r-- 182 index.php
-rw-r--r-- 19645 install.php
drwxr-xr-x - lib