Merge remote branch 'origin/master' into devel0.15-rc1
tree53845802f1428f53650f1581f7de873976fa0cbc
-rw-r--r-- 759 .gitignore
-rw-r--r-- 35147 COPYING
lrwxrwxrwx 16 Changelog -> debian/changelog
lrwxrwxrwx 10 README -> doc/README
-rw-r--r-- 11226 Rakefile
drwxr-xr-x - auto
-rwxr-xr-x 54 build-wiki
drwxr-xr-x - config
drwxr-xr-x - data
drwxr-xr-x - debian
lrwxrwxrwx 50 doc -> config/chroot_local-includes/usr/share/doc/amnesia
drwxr-xr-x - features
-rw-r--r-- 13528 ikiwiki-cgi.setup
-rw-r--r-- 12125 ikiwiki.setup
-rw-r--r-- 893 languages_statistics.sh
-rwxr-xr-x 1570 refresh-translations
-rwxr-xr-x 2136 release
drwxr-xr-x - vagrant
drwxr-xr-x - wiki