projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: effc9a5 8a3cd9d)
[MERGE] branch merged with trunk-payroll-salary_rules-psi
authormtr <mtr@mtr>
Mon, 21 Mar 2011 10:42:14 +0000 (16:12 +0530)
committermtr <mtr@mtr>
Mon, 21 Mar 2011 10:42:14 +0000 (16:12 +0530)
bzr revid: mtr@mtr-20110321104214-ox224vp73t3btkwj


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