projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 452a6f8 491387a)
[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Mon, 28 Mar 2011 12:22:51 +0000 (17:52 +0530)
committermtr <mtr@mtr>
Mon, 28 Mar 2011 12:22:51 +0000 (17:52 +0530)
bzr revid: mtr@mtr-20110328122251-mbqfd7qzrpxi2lgt


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