Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorhackbard <hackbard@tx2.hackdaworld.org>
Sat, 27 Feb 2010 10:12:42 +0000 (11:12 +0100)
committerhackbard <hackbard@tx2.hackdaworld.org>
Sat, 27 Feb 2010 10:12:42 +0000 (11:12 +0100)

Trivial merge