[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 13 Aug 2012 15:26:04 +0000 (17:26 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 13 Aug 2012 15:26:04 +0000 (17:26 +0200)
commitc06ff002b5925ddf63cc92ad5f1de7304894967b
tree7fbb2964d6b2e697c63781c5d26408a7dc82487b
parent381d97cbf270ff5db37c9acaf8736acba52e100f
parent36aaaf4a32ab2eeadec780f784cf697989ac3f69
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
addons/portal/portal_data.xml