Merge nmbug.tethera.net:nmbug-tags
authorDaniel Schoepe <daniel@schoepe.org>
Sun, 12 Feb 2012 17:50:13 +0000 (18:50 +0100)
committerDaniel Schoepe <daniel@schoepe.org>
Sun, 12 Feb 2012 17:50:13 +0000 (18:50 +0100)

Trivial merge