Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorhackbard <hackbard@tx2.hackdaworld.org>
Thu, 4 Mar 2010 21:52:03 +0000 (22:52 +0100)
committerhackbard <hackbard@tx2.hackdaworld.org>
Thu, 4 Mar 2010 21:52:03 +0000 (22:52 +0100)

Trivial merge