Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:13:12 +0000 (18:13 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:13:12 +0000 (18:13 -0600)
commit4c20fdfa543059739b756171b991d430789cded1
treef39e6c729364211bf0570c459c37b576ecf9faa9
parente58dd78bcb749315f84168c83a74cf80851bf815
parent2f0c977c747824d0798550ac64eceb1d66c50efd
Merge branch 'branch-1.6' into debian