Update composer.json
Merge branch 'master' of git://github.com/lciolecki/doctrine1