Merge branch 'devel' into feature/i2p-0.9.8.1
tree0735d6162c76e2cb02aabc7186b73302205741c9
-rw-r--r-- 1273 .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-- 12615 ikiwiki-cgi.setup
-rw-r--r-- 11698 ikiwiki.setup
drwxr-xr-x - po
-rwxr-xr-x 2773 refresh-translations
-rwxr-xr-x 3345 release
-rwxr-xr-x 5475 run_test_suite
drwxr-xr-x - vagrant
drwxr-xr-x - wiki