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

Trivial merge