Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Wed, 20 Nov 2013 21:12:59 +0000 (17:12 -0400)
committerDavid Bremner <bremner@unb.ca>
Wed, 20 Nov 2013 21:12:59 +0000 (17:12 -0400)

Trivial merge