Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Fri, 30 Nov 2012 15:44:20 +0000 (11:44 -0400)
committerDavid Bremner <bremner@unb.ca>
Fri, 30 Nov 2012 15:44:20 +0000 (11:44 -0400)

Trivial merge