From: David Bremner <bremner@unb.ca>
Date: Thu, 18 Jul 2013 21:49:32 +0000 (-0300)
Subject: Merge nmbug.tethera.net:nmbug-tags
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25bb41e8711f90326a1a5c495ee5a5da17f2ce04;p=nmbug-tags.git

Merge nmbug.tethera.net:nmbug-tags
---

25bb41e8711f90326a1a5c495ee5a5da17f2ce04