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)
commit9d3b2eefd51cb6f611fee6bae0bd7912a0c206ae
tree3956306dac98fcca9f803270fb4fd92c389147c7
parent6789e0b59655d597061d7be4a81ecb446a354048
parentea1c9e27203d1fd8f1f0889c5f8371ce7fac4930
Merge branch 'master' into debian

Merge in 0.9.4