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)
commit80f7de68d75de2d5ace40d954937097b037a390c
treedbb18f062d70990ae371a8fd218e554b4fbedd9d
parent4036a1ae7a9694c9c69749ec8e36143c31bce976
parent3020c9c9d991b7edd7a39d350877834e5bb9f288
Merge branch 'master' into rule_fixes