Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:15:24 +0000 (19:15 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:15:24 +0000 (19:15 -0700)
commita3af6f68a6f2a34ae862a912ab3a270b27545c1d
tree8e76b0d8e0366b2c88a0bdb686771bb0c43e3efa
parent54b019b6dd059fafa213113ff3dbd1ddfcacf7c8
parentb53c78e75879d647935a30acb88fdd69467617a7
Merge branch 'branch-1.6' into debian