[MERGE] Merged with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Tue, 14 Aug 2012 07:01:24 +0000 (12:31 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Tue, 14 Aug 2012 07:01:24 +0000 (12:31 +0530)
commit3db58da020bd5a366cc4fb7bc3fb399778412176
treecdb9377de26c31242fbb9a79a8537358009df423
parent71cd55490ab73e16811c960f0f45bc9f4aa4aaf0
parentcd04752f66d238e7eaa5277f4102c7e8849cd684
[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120814070124-c0mc9tgdjed3w5ae
addons/document_page/web/widgets/rss/feedparser.py
addons/document_page/wizard/wiki_make_index.py