Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Sun, 7 Apr 2013 19:16:20 +0000 (16:16 -0300)
committerDavid Bremner <bremner@unb.ca>
Sun, 7 Apr 2013 19:16:20 +0000 (16:16 -0300)

Trivial merge