Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 26 Sep 2015 13:31:50 +0000 (10:31 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 26 Sep 2015 13:31:50 +0000 (10:31 -0300)
commit33c8777a967ece2dd4bbda7e83a4e07c195abf51
tree2f1af6b1628e94f1ff9b1366a20edb1609c74786
parent02e394aed216622ac355ff15bae74403abf40417
parent754d84edad2534099b53c15cc5b443a672621622
Merge branch 'release'

bring debian specific changes into master