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)
commitdcda5a3b8722768a1dc877284263c693188a9c85
treec5558a7a93aff7776fbee7f6190e7360bd0c9281
parent07bc5fbf0692822d960cd274e4aa8ef2f2c6631a
parent3b9c53fd7fe3fc1c66906ca54eb1704107956968
Merge branch 'master' into plugin

Conflicts:

bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml