Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.TODO:1. Bump acs-core package version numbers to 5.3.0d12. Would be nice to do a test install, wouldn't it?
Fixing bugs in user merge support. Improving the process, making it more generic and now it works for acs-core. Adding the upgrade scripts for oracle and pg.