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)
commit3de115fb7f929d02792a4b8139c3aeb9e41e0422
tree10057ed6de1bd3c1e3b4ba8224987e2e3e4af38f
parent80f7de68d75de2d5ace40d954937097b037a390c
parentdd30d2daaa973fb4c58de643c3c67c3424b07d7f
Merge branch 'master' into rule_fixes