Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 20 May 2014 01:10:53 +0000 (21:10 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 20 May 2014 01:10:53 +0000 (21:10 -0400)

Trivial merge