Merge branch 'master' into plugin
authorChristian Garbs <mitch@cgarbs.de>
Fri, 26 Dec 2008 23:00:07 +0000 (00:00 +0100)
committerChristian Garbs <mitch@cgarbs.de>
Fri, 26 Dec 2008 23:00:07 +0000 (00:00 +0100)
Conflicts:

bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml


Trivial merge