plone.app.layout 2.2.12
Merge branch '4.2' of github.com:plone/buildout.coredev into 4.2

Conflicts:
	versions.cfg