Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Sat, 8 Sep 2012 14:06:24 +0000 (11:06 -0300)
committerDavid Bremner <bremner@unb.ca>
Sat, 8 Sep 2012 14:06:24 +0000 (11:06 -0300)

Trivial merge