Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:36:59 +0000 (13:36 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:36:59 +0000 (13:36 -0600)
commitf4f0f044df1251d64d44bf62d25b488fd04a05c8
tree12efee1447a67d8cf37b6f447c011708264b8266
parentb25690062ac04a588ad4d11740597c20e516eb1a
parent570daace9caf7647a09c53d5c75593cc4c98b93b
Merge branch 'branch-1.6' into debian