Commit Graph

2 Commits

Author SHA1 Message Date
Bart Visscher 5549c77ec5 Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Bart Visscher b04e09a901 Move DoctrineStatementWrapper to its own file 2013-06-28 11:48:38 +02:00