Merge branch 'master' into rule_fixes
authorDaniel Fischer <daniel.is.fischer@googlemail.com>
Sun, 17 Feb 2013 16:24:20 +0000 (17:24 +0100)
committerDaniel Fischer <daniel.is.fischer@googlemail.com>
Sun, 17 Feb 2013 16:24:20 +0000 (17:24 +0100)

Trivial merge