Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
tree5993a23ebb7d8a1fdf65c47caf9d52b0ea0cd705
-rw-r--r-- 1433 .gitignore
-rw-r--r-- 35147 COPYING
lrwxrwxrwx 16 Changelog -> debian/changelog
lrwxrwxrwx 10 README -> doc/README
-rw-r--r-- 10243 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-- 12636 ikiwiki-cgi.setup
-rw-r--r-- 11743 ikiwiki.setup
-rwxr-xr-x 2362 import-translations
drwxr-xr-x - po
-rwxr-xr-x 2844 refresh-translations
-rwxr-xr-x 3345 release
-rwxr-xr-x 5666 run_test_suite
drwxr-xr-x - vagrant
drwxr-xr-x - wiki