Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Fri, 21 Oct 2011 03:51:09 +0000 (14:51 +1100)
committerLuke Howard <lukeh@padl.com>
Fri, 21 Oct 2011 03:51:09 +0000 (14:51 +1100)

Trivial merge