Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Tue, 18 Mar 2014 10:55:45 +0000 (07:55 -0300)
committerDavid Bremner <david@tethera.net>
Tue, 18 Mar 2014 10:55:45 +0000 (07:55 -0300)

Trivial merge