Merge http://nmbug.tethera.net/git/nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Thu, 2 Jan 2014 17:32:14 +0000 (13:32 -0400)
committerDavid Bremner <bremner@unb.ca>
Thu, 2 Jan 2014 17:32:14 +0000 (13:32 -0400)

Trivial merge