Branch of 1.2.5 xmlsh release
Based on r 885 - stable release of 1.2.x line
Authored by: daldei 2014-07-22
Parent: [r928]
Child: [r930]