Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Thu, 13 Mar 2014 03:22:44 +0000 (00:22 -0300)
committerDavid Bremner <david@tethera.net>
Thu, 13 Mar 2014 03:22:44 +0000 (00:22 -0300)

Trivial merge