merged 2.0
merged 2.0

fabpot/DoctrineBundle,mikeSimonson/DoctrineBundle,Soullivaneuh/DoctrineBundle,javiereguiluz/DoctrineBundle,Soullivaneuh/DoctrineBundle,hason/DoctrineBundle,nicolas-grekas/DoctrineBundle,OskarStark/DoctrineBundle,gencer/DoctrineBundle,nicolas-grekas/DoctrineBundle,hacfi/DoctrineBundle,chrisguitarguy/DoctrineBundle,fervo/DoctrineBundle,stof/DoctrineBundle,hason/DoctrineBundle,lafourchette/DoctrineBundle,javiereguiluz/DoctrineBundle,hacfi/DoctrineBundle,fabpot/DoctrineBundle,chrisguitarguy/DoctrineBundle,doctrine/DoctrineBundle,skafandri/DoctrineBundle,gencer/DoctrineBundle,dunglas/DoctrineBundle,OskarStark/DoctrineBundle,mikeSimonson/DoctrineBundle,fervo/DoctrineBundle,skafandri/DoctrineBundle