Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Fri, 6 Sep 2013 22:26:52 +0000 (19:26 -0300)
committerDavid Bremner <bremner@unb.ca>
Fri, 6 Sep 2013 22:26:52 +0000 (19:26 -0300)

Trivial merge