Merge nmbug.tethera.net:nmbug-tags
authorMark Walters <markwalters1009@gmail.com>
Sun, 26 May 2013 06:51:43 +0000 (07:51 +0100)
committerMark Walters <markwalters1009@gmail.com>
Sun, 26 May 2013 06:51:43 +0000 (07:51 +0100)

Trivial merge