base
Merge branch 'master' of github.com:yorenard/PimpMyQueryBundle

Conflicts:
	DependencyInjection/Configuration.php
	DependencyInjection/YoRenardPimpMyQueryExtension.php
	composer.json