Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:09:09 +0000 (19:09 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:09:09 +0000 (19:09 -0700)
commit4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef
tree4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3
parent19d25c9f4c80d2c8562fc4abd766a23961167e79
parenta2ea621eac3263348aff50885c79296f8ece26ed
Merge branch 'branch-1.6' into debian
Releasing