Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
treef10148e2ba020dfbca78818992a95025852c9cc1
-rw-r--r-- 997 .gitignore
-rw-r--r-- 1509 .htaccess.dist
-rw-r--r-- 18092 COPYING
-rw-r--r-- 306 README
drwxr-xr-x - _cs
drwxr-xr-x - _test
drwxr-xr-x - bin
drwxr-xr-x - conf
drwxr-xr-x - data
-rw-r--r-- 2323 doku.php
-rw-r--r-- 18750 feed.php
drwxr-xr-x - inc
-rw-r--r-- 182 index.php
-rw-r--r-- 19666 install.php
drwxr-xr-x - lib