Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 14 Jun 2014 02:03:49 +0000 (23:03 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 14 Jun 2014 02:03:49 +0000 (23:03 -0300)
Merge in a few more commits towards 0.18.1


Trivial merge