[MERGE] branch merged with trunk-payroll-india-mra
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 16 Jul 2012 09:27:50 +0000 (14:57 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Mon, 16 Jul 2012 09:27:50 +0000 (14:57 +0530)
commitccc985059a806ceeea112cfb2cf059f751919d27
tree926a51c8ce3e917a711b61fbdc3ce6c0ff44ea27
parentfeacc599ec391bf83207672251abc13745e5e4ed
parent1e1644010b834f06a94473f1b3b1f0c80b0d8d0b
[MERGE] branch merged with trunk-payroll-india-mra

bzr revid: mtr@tinyerp.com-20120716092750-0deyjpp1xcly08h2