Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:25:48 +0000 (10:25 +0200)
committerBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:25:48 +0000 (10:25 +0200)
commit7d1d1759a0b9dfa1ab95ff0c217c5d921452b920
tree0142ad2cc197266de216b6d531e1457c0da20ac5
parent982087ff2ed3c724a4d33f7d4010eda02ab88d10
parent148b013dd29c26920ddfb53449ed4d8cc5a4b5ee
Merge branch 'branch-1.6' into debian