[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022...
authorChristophe Simonis <chs@openerp.com>
Wed, 29 Jan 2014 18:47:03 +0000 (19:47 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 29 Jan 2014 18:47:03 +0000 (19:47 +0100)
commit731019154a69600b2c3938fa333e616696826d20
tree9cfe70fcc0b1d6b5e9ba3e1ec5e6d2013548faaf
parent64822bd188df0a679f0f2e1b421d5eba5a22e76e
parent6cc096aebc019d5ee7c5c7009384fe99df404518
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah

bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
addons/account/account.py
addons/calendar/calendar.py
addons/email_template/email_template.py
addons/im/im.py
addons/im/static/src/js/im.js
addons/im_livechat/im_livechat.py
addons/mrp_operations/mrp_operations_view.xml
addons/sale/sale_view.xml