From: David Bremner <bremner@unb.ca>
Date: Mon, 20 May 2013 15:05:56 +0000 (-0300)
Subject: Merge nmbug.tethera.net:nmbug-tags
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=477c819c725d52058484e6e1a7c10bfdcf3c952c;p=nmbug-tags.git

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

477c819c725d52058484e6e1a7c10bfdcf3c952c