Merge branch 'master' of git://git.tails.boum.org/tailsmaster
treea7a332104c2469ebfe53bb624c15844018f80295
-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-- 12601 ikiwiki-cgi.setup
-rw-r--r-- 11744 ikiwiki.setup
drwxr-xr-x - po
-rwxr-xr-x 2679 refresh-translations
-rwxr-xr-x 3345 release
-rwxr-xr-x 5440 run_test_suite
drwxr-xr-x - vagrant
drwxr-xr-x - wiki