symfony2admingenerator/AdmingeneratorGeneratorBundle — pull request #301 by loostro (2012-12-08 11:27:44+00:00)
Title: Master Fixes

Manual merge with resolved conflicts