Merge branch 'master' into testing0.7-rc2
tree7554fd56937565f19d9a6e5668e9525784049a71
-rw-r--r-- 696 .gitignore
-rw-r--r-- 35147 COPYING
lrwxrwxrwx 16 Changelog -> debian/changelog
lrwxrwxrwx 10 README -> doc/README
drwxr-xr-x - auto
-rwxr-xr-x 54 build-wiki
drwxr-xr-x - config
drwxr-xr-x - data
drwxr-xr-x - deb-src
drwxr-xr-x - debian
lrwxrwxrwx 50 doc -> config/chroot_local-includes/usr/share/doc/amnesia
lrwxrwxrwx 55 home-refresh -> config/chroot_local-includes/usr/local/bin/home-refresh
-rw-r--r-- 1969 ikiwiki-cgi.setup
-rw-r--r-- 1613 ikiwiki.setup
-rwxr-xr-x 1081 refresh-translations
-rwxr-xr-x 2136 release
drwxr-xr-x - wiki