Christian Heinrich
3fc9971e98
Merge commit 'upstream/master'
Conflicts: lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
Description
Languages
PHP
100%