[MERGE] config rework ir.action.todo stw
authorAntony Lesuisse <al@openerp.com>
Sat, 24 Sep 2011 14:20:47 +0000 (16:20 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 24 Sep 2011 14:20:47 +0000 (16:20 +0200)
bzr revid: al@openerp.com-20110924142047-rdo7gwoluoydbfz4

1  2 
addons/hr_holidays/hr_holidays_view.xml
addons/stock/stock_view.xml

Simple merge