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)
commite64aebd3b9228953f64f345c137d98e1dc85f424
tree36142e9457619478522ed8ceec112c4df544d140
parent94bc27518014ed63ce12aaa113055b5d8da66f65
parent2ad0d55c2f99e08b94d88951a39fc9c24ac91e14
Merge branch 'master' into kerberos

Conflicts:
src/practical_settings/kerberos.tex