Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Fri, 25 Mar 2011 12:32:15 +0000 (23:32 +1100)
committerLuke Howard <lukeh@padl.com>
Fri, 25 Mar 2011 12:32:15 +0000 (23:32 +1100)

Trivial merge