Marc Alexander c9ada4d201 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	build/build.xml

2016-08-04 20:45:42 +02:00

..

code_sniffer

…

webpi

…

build_announcement.php

…

build_changelog.php

…

build_helper.php

…

build.xml

Merge branch '3.1.x' into 3.2.x

2016-08-04 20:45:42 +02:00

compare.sh

…

package.php

…

sami-all.conf.php

…

sami-checkout.conf.php

…