[MERGE] hr: fixed bug 899234: added noupdate to hr data files
authorThibault Delavallée <tde@openerp.com>
Wed, 21 Dec 2011 12:45:32 +0000 (13:45 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 21 Dec 2011 12:45:32 +0000 (13:45 +0100)
bzr revid: tde@openerp.com-20111221124532-har6wmsdiwu57koe


Trivial merge