Merge branch 'branch-1.5' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:33:59 +0000 (01:33 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:33:59 +0000 (01:33 -0600)
commit7dccae47537d39a2d56ffd93642bc455d1c5d9a5
treebac497ac037a58dbbb9e0235aaaf013ed6f9d83d
parent8ffc76a42ad5e3bdc7ce0529b6143f076de4a3ac
parent10e31d84ee5cdf10248988079df91354ae6ed612
Merge branch 'branch-1.5' into debian