l3l0 dc98b98d3d Merge remote-tracking branch 'RobinvdVleuten/master' into cache-adapter ...

Conflicts:
	Resources/config/gaufrette.xml

2012-09-05 19:45:48 +02:00

..

adapter_factories.xml

CacheAdapterFactory created

2012-03-01 17:13:11 +01:00

gaufrette.xml

Merge remote-tracking branch 'RobinvdVleuten/master' into cache-adapter

2012-09-05 19:45:48 +02:00