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)
1  2 
Releasing

diff --cc Releasing
Simple merge