projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c248328 b46561a)
[MERGE] hr,hr_contract,hr_holidays,hr_recureiment: Merge with ATP branch for YAML
authormra (Open ERP) <mra@tinyerp.com>
Thu, 27 May 2010 12:12:20 +0000 (17:42 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Thu, 27 May 2010 12:12:20 +0000 (17:42 +0530)
bzr revid: mra@tinyerp.com-20100527121220-mr11e0tkdv40ybyi


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