[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Wed, 23 Mar 2011 10:48:10 +0000 (16:18 +0530)
committermtr <mtr@mtr>
Wed, 23 Mar 2011 10:48:10 +0000 (16:18 +0530)
commit946dd1d299a2a4e0754213d8e29f3411b012eba8
treef6d7d6a6e56b0db0cc99d4eb246158686a1d081c
parente2c0b95e0bfc524cb03e7bc75dd920f928f68a78
parent794c39d803bff5dced8e538f5751ba23193d411c
[MERGE] branch merged with trunk-payroll-salary_rules-psi

bzr revid: mtr@mtr-20110323104810-1vbz5tdezm3dywqm