Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorhackbard <hackbard@sage.physik.uni-augsburg.de>
Sat, 6 Aug 2011 10:34:56 +0000 (12:34 +0200)
committerhackbard <hackbard@sage.physik.uni-augsburg.de>
Sat, 6 Aug 2011 10:34:56 +0000 (12:34 +0200)

Trivial merge