Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 17 May 2014 21:37:48 +0000 (06:37 +0900)
committerDavid Bremner <david@tethera.net>
Sat, 17 May 2014 21:37:48 +0000 (06:37 +0900)
bugfix release being built up on release.


Trivial merge