Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian
authorSam Hartman <hartmans@debian.org>
Thu, 14 Nov 2013 03:31:59 +0000 (22:31 -0500)
committerSam Hartman <hartmans@debian.org>
Thu, 14 Nov 2013 03:31:59 +0000 (22:31 -0500)

Trivial merge