Merge nmbug.tethera.net:nmbug-tags
authorJani Nikula <jani@nikula.org>
Sun, 2 Sep 2012 20:01:48 +0000 (23:01 +0300)
committerJani Nikula <jani@nikula.org>
Sun, 2 Sep 2012 20:01:48 +0000 (23:01 +0300)
commit4e9658b813824444bf306c83af2f3f3a0ca76eaf
treed554b233aa0150aa3ac95b52b8ca4cf9e9c30860
parent341c3f710f6031dfa7af91f5201b3ec698ba715b
parentb34dcd62b8489f3bfeccd34bd6ab9cc6925413f7
Merge nmbug.tethera.net:nmbug-tags