[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:12 +0000 (09:45 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:12 +0000 (09:45 +0200)
commit229bb1333bc101a29701e201e7d318c78aaf222f
tree644094b7601dd014e9c1b30212d4b95c1a6e75d7
parent5f76e998a52b93f0ba1a8bf42fca42815a51bdab
parent4e50f6861f9119167b005e9d208d3595fb80ecdf
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130425143852-vslppf235z2dyhjc
bzr revid: tde@openerp.com-20130426074512-10d3bsx7f0cki2aj