[MRG] merge with main branch
authorAmit Vora <avo@tinyerp.com>
Tue, 1 Apr 2014 09:10:41 +0000 (14:40 +0530)
committerAmit Vora <avo@tinyerp.com>
Tue, 1 Apr 2014 09:10:41 +0000 (14:40 +0530)
bzr revid: avo@tinyerp.com-20140401091041-bvxtr58qkgicl6x8

1  2 
addons/portal/portal_demo.xml

Simple merge