[MERGE] [FORWARD] Forward port of addons 7.0 until revision 9172
authorThibault Delavallée <tde@openerp.com>
Tue, 28 May 2013 11:45:49 +0000 (13:45 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 28 May 2013 11:45:49 +0000 (13:45 +0200)
commit383b3ec92ee4aa2de503108c078ee2a813175c4c
treefc3f26fdafee7c0cbc728a68281a1c3ac2053f15
parent823439f7e1553f7087de4ec5647b15df21dfecb3
parent71df1a41bc556c39eac6c37972a5da82c95d7efd
[MERGE] [FORWARD] Forward port of addons 7.0 until revision 9172

bzr revid: tde@openerp.com-20130528114549-69cx4kssei3mlcvq