Joas Schilling 36abb61d39 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml

2015-05-03 18:44:34 +02:00

..

data

…

tool

…

container_aware_migration.php

…

exception.php

…

helper.php

…

migration.php

…

profilefield_base_migration.php

…

schema_generator.php

…