Merge branch 'master' into rule_fixes
authorDaniel Fischer <daniel.is.fischer@googlemail.com>
Wed, 27 Feb 2013 13:53:29 +0000 (14:53 +0100)
committerDaniel Fischer <daniel.is.fischer@googlemail.com>
Wed, 27 Feb 2013 13:53:29 +0000 (14:53 +0100)

Trivial merge