[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Tue, 27 Sep 2011 13:27:52 +0000 (18:57 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Tue, 27 Sep 2011 13:27:52 +0000 (18:57 +0530)
commit9a4b8c11c2f82dcdbb0a3cf6620ae61365b05c0c
tree2b8a76dd981e194a786364fa9c936a520b4dd08b
parente4a89c12efffe336e650e5ab589c857e5ad1778e
parent0bee9676d5d9ffafc6e8f8bf47c976ba5e402af5
[MERGE]: Merge with lp:openobject-addons

bzr revid: aag@tinyerp.com-20110927132752-oom90a64gutddqwh
addons/l10n_be_hr_payroll/security/hr.salary.rule.csv