Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Sun, 25 Nov 2012 01:24:13 +0000 (21:24 -0400)
committerDavid Bremner <bremner@unb.ca>
Sun, 25 Nov 2012 01:24:13 +0000 (21:24 -0400)

Trivial merge