[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)
commit28a96d2651cec42b6526c7d12472bbfb7c841d4c
treef79cb30288ee9bdb709881556cc8585ec1e831d3
parentfa30038c2ce8134045356ddf304718d6ac674e49
parent0a2a118ba3de6739836d38955d98ff3a89cdea8c
[MRG] merge with main branch

bzr revid: avo@tinyerp.com-20140401091041-bvxtr58qkgicl6x8
addons/portal/portal_demo.xml