Merge http://nmbug.tethera.net/git/nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Tue, 29 Oct 2013 14:03:08 +0000 (11:03 -0300)
committerDavid Bremner <bremner@unb.ca>
Tue, 29 Oct 2013 14:03:08 +0000 (11:03 -0300)

Trivial merge