Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@debian.org>
Fri, 6 Jun 2014 11:54:41 +0000 (07:54 -0400)
committerSam Hartman <hartmans@debian.org>
Fri, 6 Jun 2014 11:54:41 +0000 (07:54 -0400)
All our changes have been accepted upstream, some with a few cleanups.


Trivial merge