Merge branch 'master' into ha (v0.12)
authorWayne Schneider <wayne@indexdata.com>
Thu, 4 Aug 2016 21:45:20 +0000 (16:45 -0500)
committerWayne Schneider <wayne@indexdata.com>
Thu, 4 Aug 2016 21:46:44 +0000 (16:46 -0500)
commit71a3ba5d1ca557850ed65ab77de142110dc8041e
tree2262a983fab9bbc3bf4cd30309cd6486320a829d
parent18a053d37b16c10ca74b8e3ea2068740cd9904c7
parent287069f7310a63a28f6fe5ee6cc8e9b9566e23b1
Merge branch 'master' into ha (v0.12)
debian/control