[merge]
authornvi-openerp <nicolas.vanhoren@openerp.com>
Mon, 25 Oct 2010 07:36:28 +0000 (09:36 +0200)
committernvi-openerp <nicolas.vanhoren@openerp.com>
Mon, 25 Oct 2010 07:36:28 +0000 (09:36 +0200)
commit673ea38b7d021bae8f5b80c6cf12288a8dc222aa
treef3848bb6c2b1a63770d7d76fdf5ceac74d36f4aa
parenta5f271f50de72282bbaaac624d14295eef7d51f4
parent58407193d73a068e94529c49bc684019ad0b6835
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20101025073628-52x5qdj49z6bazjn
addons/hr/hr.py