[MERGE] Merge hr changes
authorSbh (Openerp) <sbh@tinyerp.com>
Thu, 7 Jun 2012 09:44:18 +0000 (15:14 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Thu, 7 Jun 2012 09:44:18 +0000 (15:14 +0530)
commit6724c62ce9ac803d06e744cc0c479dd71be10d2c
treeb13c5739b7bf6bf7bf7948a568c6791c3cc1675e
parente882bc879ee80a56d668e1885123e46eb9c731d9
parent9fff7cf0a67fe0cfab83e01f1caed65a53ecbd0f
[MERGE] Merge hr changes

bzr revid: sbh@tinyerp.com-20120607094418-0x72pdog3gk2ewth