Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorFrank Zirkelbach <f.zirkelbach@fkf.mpg.de>
Mon, 20 Jan 2014 12:01:30 +0000 (13:01 +0100)
committerFrank Zirkelbach <f.zirkelbach@fkf.mpg.de>
Mon, 20 Jan 2014 12:01:30 +0000 (13:01 +0100)

Trivial merge