Fix contradicting merging policy rules#5219
Merged
wouterj merged 1 commit intosymfony:2.3from May 10, 2015
lscholten:fix_merging_policy
Merged
Fix contradicting merging policy rules#5219wouterj merged 1 commit intosymfony:2.3from lscholten:fix_merging_policy
wouterj merged 1 commit intosymfony:2.3from
lscholten:fix_merging_policy
