[MERGE] merge with lp:openobject-addons
authorNimesh (Open ERP) <nco@tinyerp.com>
Tue, 4 Dec 2012 11:06:24 +0000 (16:36 +0530)
committerNimesh (Open ERP) <nco@tinyerp.com>
Tue, 4 Dec 2012 11:06:24 +0000 (16:36 +0530)
commitc1ea2b82a17028a345fff60c75807f478cf6c2ac
tree917e67543ff5724f0672ab936811f81962dfdd50
parent28a31cd664ebdfad491544f0e38e34841116d3d8
parentbf2a3109eea5434be47760da43ccda36380bca62
[MERGE] merge with lp:openobject-addons

bzr revid: nco@tinyerp.com-20121204110624-va6tlb5oe0ikemzm
addons/hr_holidays/hr_holidays_view.xml