Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Wed, 8 Mar 2017 12:31:51 +0000 (08:31 -0400)
committerDavid Bremner <david@tethera.net>
Wed, 8 Mar 2017 12:31:51 +0000 (08:31 -0400)
commit4e872c64e1ab63f35edfd4d0a6500cc24b62fe0d
treea8dcc4673cb550b24cb725bd83303f67fde78f7e
parent8f35cb889acd82a631cc7277ee3f97cf2f50e928
parent29958b2b9a548d0cc6bc2a435e3476cdc6acd7d1
Merge branch 'release'

new release candidate, with regexp fix