[MERGE] Merged with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Wed, 22 Aug 2012 06:51:17 +0000 (12:21 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Wed, 22 Aug 2012 06:51:17 +0000 (12:21 +0530)
commit5bfe2da2be494b781f68b8af577a9d00f815c848
treef6815a68b2b7a38cf5b568ed7b84aad57c37e840
parent55da32ff65f797181c4e195583df216f4d866ebd
parent026f76510763b95c59513a3e45754d30947dca12
[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120822065117-2c81xkcrzacr09wg
addons/auth_signup/signup.py
addons/document_page/web/widgets/rss/feedparser.py
addons/document_page/wizard/wiki_make_index.py