[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Mon, 21 Mar 2011 09:50:18 +0000 (15:20 +0530)
committermtr <mtr@mtr>
Mon, 21 Mar 2011 09:50:18 +0000 (15:20 +0530)
commiteffc9a5e9656f55aad90054fdaacc2f0092ef486
tree00789721b89a65b84acf12bf4728ef4e66812d38
parent986d5bb2d4ce8a0f898c313820c3a049dc7ded73
parent3b178aaf3345b04087550a2955d9aa48814ed00f
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110321095018-hze7uqdkw3jks9g5