Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Wed, 19 Mar 2014 19:57:56 +0000 (16:57 -0300)
committerDavid Bremner <david@tethera.net>
Wed, 19 Mar 2014 19:57:56 +0000 (16:57 -0300)

Trivial merge