[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Tue, 11 Sep 2012 14:05:07 +0000 (16:05 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Tue, 11 Sep 2012 14:05:07 +0000 (16:05 +0200)
commitdaa2b3e813f14421d25921944d9dd412a4c2d114
tree6739c5b63f80e3aee54901a89085fb316f3e573c
parentb0e6046f73d616fb8b940773afd15319c9b78cce
parent6c8c793fd9b4b6120beff0935d872d6591f537ad
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120911140507-1cizcowa4xewvqf8
addons/document_page/web/widgets/rss/feedparser.py
addons/document_page/wizard/wiki_make_index.py
addons/procurement/procurement.py