[MERGE] Merged with main addons
authorThibault Delavallée <tde@openerp.com>
Fri, 10 Feb 2012 08:40:08 +0000 (09:40 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 10 Feb 2012 08:40:08 +0000 (09:40 +0100)
commita0fe3954fca78517dba634d530f75200b21b9cd7
tree23fd8e2d3cdcad3dada38ffee0182dda0f099d12
parent63b33ed44c4f0d157c22b07ec1d3788aac712ff4
parent5d4664f8236baa47d03616d4e0aa18424be921c6
[MERGE] Merged with main addons

bzr revid: tde@openerp.com-20120210084008-tinfpl5td3fummq2