[MERGE] forward port of branch 7.0 up to revid 9735 mat@openerp.com-20140106153818...
authorChristophe Simonis <chs@openerp.com>
Tue, 7 Jan 2014 14:25:54 +0000 (15:25 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 7 Jan 2014 14:25:54 +0000 (15:25 +0100)
commitc0117351a8456c300f1ea62befd9a1a294b132a5
treeb357fe4f948c6215a41912d44fe9367e0292cc68
parente5e397b01baa6a7a09170fa71a988566c7fad3b6
parent389235221a862a1fc701639ec226dd018fceb692
[MERGE] forward port of branch 7.0 up to revid 9735 mat@openerp.com-20140106153818-lsy030btlzminvw9

bzr revid: chs@openerp.com-20140107142554-lx0ls3fly7cxmahj
addons/analytic/analytic.py
addons/mail/mail_thread.py