Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Fri, 9 Sep 2016 01:18:37 +0000 (22:18 -0300)
committerDavid Bremner <david@tethera.net>
Fri, 9 Sep 2016 01:18:37 +0000 (22:18 -0300)
commit07dff496304d6dc2e8033a18691b095ed9cd212f
treeaa9825c27bcab84a5ec8d5a49fdc3d5fbe2dd6ec
parentfce8146a8b738f2317034fee6236cdbd3597849b
parentda5029e2ac8dfd8a839de1f6a4701237d0b34db1
Merge branch 'release'

hand fixed conflicts with NEWS
NEWS