Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Wed, 29 Oct 2014 19:18:45 +0000 (20:18 +0100)
committerDavid Bremner <david@tethera.net>
Wed, 29 Oct 2014 19:18:45 +0000 (20:18 +0100)

Trivial merge