merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 14:20:18 +0000 (15:20 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 11 Nov 2011 14:20:18 +0000 (15:20 +0100)
commitec5cfd90c8b64dee7d0ec242a01191b99bbb91f6
treee501f7d31dd87a37cc07d977656440be36acdd50
parentbbf5c7002e0812fe1a0ff3d13f91bd2254cb9abd
parentc4cda79286e997c7acc58ac40157bc8bb1fe22f7
merge

bzr revid: fp@tinyerp.com-20111111142018-16azu4012vzo028h
addons/hr/hr_view.xml