Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Wed, 27 Apr 2011 14:45:14 +0000 (16:45 +0200)
committerLuke Howard <lukeh@padl.com>
Wed, 27 Apr 2011 14:45:14 +0000 (16:45 +0200)

Trivial merge