Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:48:32 +0000 (23:48 +0200)
committerBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:48:32 +0000 (23:48 +0200)
commit06c3d5420080bc1c6fdfb213a9d616b75611c159
treee882a83c3a76c82e3a8e832eb3805c0c5c010d0d
parenteb5bd00b1c5045e64753ba9d066ef5cfce9d5a1e
parentea1ff225f1f450ee3fc377807d1bb7b982bf792d
Merge branch 'branch-1.6' into debian