missed one in a202018f698bdef2f1396d91afd6f0c72ae6a534
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/zp-extensions/tiny_mce/config/zenphoto-default.js.php

	modified:   zp-core/zp-extensions/tiny_mce/config/zenphoto-default.js.php