Merge nmbug.tethera.net:nmbug-tags
authorJustus Winter <4winter@informatik.uni-hamburg.de>
Wed, 25 Apr 2012 15:22:17 +0000 (17:22 +0200)
committerJustus Winter <4winter@informatik.uni-hamburg.de>
Wed, 25 Apr 2012 15:22:17 +0000 (17:22 +0200)

Trivial merge