Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorhackbard <hackbard@sage.physik.uni-augsburg.de>
Fri, 26 Feb 2010 15:21:37 +0000 (16:21 +0100)
committerhackbard <hackbard@sage.physik.uni-augsburg.de>
Fri, 26 Feb 2010 15:21:37 +0000 (16:21 +0100)

Trivial merge