Merge http://nmbug.tethera.net/git/nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Wed, 13 Nov 2013 13:22:58 +0000 (09:22 -0400)
committerDavid Bremner <bremner@unb.ca>
Wed, 13 Nov 2013 13:22:58 +0000 (09:22 -0400)

Trivial merge