Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Sat, 12 Oct 2013 11:30:57 +0000 (08:30 -0300)
committerDavid Bremner <bremner@unb.ca>
Sat, 12 Oct 2013 11:30:57 +0000 (08:30 -0300)

Trivial merge