avalanche123/AvalancheImagineBundle — pull request #162 by Nek- (2013-08-27 18:41:46+00:00)
Title: Fixed bad merging

Hello,

For now, the merge doesn't work, the configuration is overrided. by the last.