Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Sun, 30 Mar 2014 22:15:57 +0000 (19:15 -0300)
committerDavid Bremner <david@tethera.net>
Sun, 30 Mar 2014 22:15:57 +0000 (19:15 -0300)

Trivial merge