Merge branch 'master' of http://nmbug.tethera.net/git/nmbug-tags
authorW. Trevor King <wking@tremily.us>
Mon, 10 Mar 2014 18:30:37 +0000 (11:30 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 10 Mar 2014 18:30:37 +0000 (11:30 -0700)

Trivial merge