Roman S. Borschel bff4f49b7a Merge commit 'upstream/master' ... Conflicts: lib/Doctrine/Common/Annotations/AnnotationReader.php lib/Doctrine/Common/Annotations/Parser.php		2010-04-26 13:17:36 +02:00
..
Doctrine/Tests	Merge commit 'upstream/master'	2010-04-26 13:17:36 +02:00
.gitignore	Fix Testsuite to work with Git	2010-04-07 20:47:53 +02:00
dbproperties.xml.dev	[2.0] DDC-295 - Add OracleSessionInit postConnect Subscriber	2010-01-31 22:01:58 +00:00