Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian
authorSam Hartman <hartmans@debian.org>
Sun, 24 Aug 2014 19:22:19 +0000 (15:22 -0400)
committerSam Hartman <hartmans@debian.org>
Sun, 24 Aug 2014 19:22:19 +0000 (15:22 -0400)

Trivial merge