Merge branch 'master' into kerberos
authorAlexander Wuerstlein <arw@arw.name>
Sun, 19 Jan 2014 13:36:22 +0000 (14:36 +0100)
committerAlexander Wuerstlein <arw@arw.name>
Sun, 19 Jan 2014 13:36:22 +0000 (14:36 +0100)
Conflicts:
src/practical_settings/kerberos.tex


Trivial merge