[MERGE]
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 29 Sep 2012 12:57:00 +0000 (14:57 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 29 Sep 2012 12:57:00 +0000 (14:57 +0200)
commitf8a53531b038f6215b4af13f916e3ed705766776
tree6145b9a83d4158c2d1a7721ed76e37a2ad32dd04
parent9cef1cbec9728e31ef12f58ac14917c9c14a7989
parentd473fb95a3c9acf4048b8bd218f1837d4a1057dd
[MERGE]

bzr revid: fp@tinyerp.com-20120929125700-qk7d8vdpwci8yglx
addons/hr/hr_view.xml