Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:55:47 +0000 (17:55 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:55:47 +0000 (17:55 +0200)
commitabbdc83db93d5e228241b4eea24cd444f44eea57
tree905615af2b7817a7e99c7a79f7cb3295a7fa5a15
parent7b7e51b9bb83443231b9dc021385a74bb2b81671
parent489d22f448d9927533e90da4d16c5a332a234a8d
Merge branch 'branch-1.6' into debian