[MERGE] lp:912194 (hr_payroll: fix action salary rule category hierarchy)
authorRaphael Collet <rco@openerp.com>
Tue, 10 Jan 2012 10:17:41 +0000 (11:17 +0100)
committerRaphael Collet <rco@openerp.com>
Tue, 10 Jan 2012 10:17:41 +0000 (11:17 +0100)
bzr revid: rco@openerp.com-20120110101741-nrji0ph9gdrvcron


Trivial merge