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)
commitc67587f003db32a60aca93fc12f7e82204ee55f6
treed7f56b893907624b13fa38c5550d5787a85712b6
parent7d81d700426a76a1ccec107ea2c95d8c47d31465
parenta33ec9ce40ff6304d620d391593357f22dcebbf0
Merge branch 'release'

bugfix release being built up on release.