Christian Heinrich 3fc9971e98 Merge commit 'upstream/master' ...

Conflicts:
	lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

2010-05-20 14:17:39 +02:00

..

api

Adding new API docs.

2010-04-14 17:13:14 +02:00

Doctrine

Merge commit 'upstream/master'

2010-05-20 14:17:39 +02:00

vendor/Symfony/Components

Merging some fixes to Symfony Console component

2010-04-16 13:21:16 -04:00