[MERGE] merge with main addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Fri, 24 Aug 2012 05:34:13 +0000 (11:04 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Fri, 24 Aug 2012 05:34:13 +0000 (11:04 +0530)
commit53c75799eeb6094b476f420c6812f21e8be30ac0
tree4523b21827a4d37b42b7b419db3e997d8c76427b
parent987e362d7f9f507a00aabbedc24790580aa4b7a8
parent6ebb35dc021e4af6287c613e98093bd56391791b
[MERGE] merge with main addons

bzr revid: cha@tinyerp.com-20120824053413-muusma66uwo92313
addons/account_asset/account_asset.py
addons/document_page/data/wiki_quickstart.xml
addons/document_page/web/widgets/rss/feedparser.py
addons/document_page/wizard/wiki_make_index.py
addons/document_page/wizard/wiki_make_index_view.xml
addons/document_page/wizard/wiki_wiki_page_open_view.xml