Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Sun, 19 Oct 2014 10:07:43 +0000 (12:07 +0200)
committerDavid Bremner <david@tethera.net>
Sun, 19 Oct 2014 10:07:43 +0000 (12:07 +0200)

Trivial merge