Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Fri, 14 Dec 2012 13:39:46 +0000 (09:39 -0400)
committerDavid Bremner <bremner@unb.ca>
Fri, 14 Dec 2012 13:39:46 +0000 (09:39 -0400)

Trivial merge