projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2c0b95 794c39d)
[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)
bzr revid: mtr@mtr-20110323104810-1vbz5tdezm3dywqm


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.