Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:02:00 +0000 (10:02 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:02:00 +0000 (10:02 -0600)
commit085336c45ce0577031a7af5de117a8b856160708
tree13a145eab69e38f2658359fa8395e7257b3c3fb9
parent50c9a54ac6b04458970eedfa6d3e0e25f41c765f
parent639e461ded29a48c155afea12171cbfc191ccfd7
Merge branch 'branch-1.6' into debian