correct branch for 1.2.0 fixes ?

I've seen a few fixes being submitted for 1.2.0 to com.xaraya.core, and
committed a few myself now. But looking at the code & templates, this
branch doesn't seem to correspond to the released aruba 1.2.0 download
anymore.

Could someone propagate whichever changes were made to prepare 1.2.0
back to the main com.xaraya.core branch ?

Thanks,

Mike.