Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Sat, 10 Dec 2011 23:57:48 +0000 (10:57 +1100)
committerLuke Howard <lukeh@padl.com>
Sat, 10 Dec 2011 23:57:48 +0000 (10:57 +1100)

Trivial merge