Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Wed, 9 Apr 2014 11:35:48 +0000 (08:35 -0300)
committerDavid Bremner <david@tethera.net>
Wed, 9 Apr 2014 11:35:48 +0000 (08:35 -0300)

Trivial merge