Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Wed, 25 Mar 2015 16:43:14 +0000 (12:43 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 25 Mar 2015 16:43:14 +0000 (12:43 -0400)
Merge in 0.9.4


Trivial merge