Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Sat, 22 Mar 2014 12:08:58 +0000 (09:08 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 22 Mar 2014 12:08:58 +0000 (09:08 -0300)

Trivial merge