Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 13 May 2017 11:51:10 +0000 (08:51 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 13 May 2017 11:51:10 +0000 (08:51 -0300)
commit523d2b50fcaae90cbe09975c1f1bc652ff521ec6
tree3f56deb9021bb5a8f030939e93d43b302cb07d55
parent30c475c1ef3d6823ed9ab0affc30328726c5240f
parent2d79d38a0f74ccf2195e3685cd114646961e4000
Merge branch 'release'

Emacs bug fix from Mark