Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Wed, 6 Feb 2013 12:17:12 +0000 (08:17 -0400)
committerDavid Bremner <bremner@unb.ca>
Wed, 6 Feb 2013 12:17:12 +0000 (08:17 -0400)

Trivial merge