[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Wed, 28 Aug 2013 16:39:37 +0000 (18:39 +0200)
committerChristophe Matthieu <chm@openerp.com>
Wed, 28 Aug 2013 16:39:37 +0000 (18:39 +0200)
commited35895126a1e24b4af0b0fb7dced13ff8be873f
treee339135c9f50de1b459ea8bcad693d70f214c781
parent2fab26a2d229cc853aeb983af038c9e2c98b339d
parent00d3d9a4b6ee444e68b2db28f0726192a686a411
[MERGE] from trunk

bzr revid: chm@openerp.com-20130828163937-japdo58t20hhqfoz
addons/im_livechat/im_livechat.py
addons/im_livechat/loader.js
addons/im_livechat/static/ext/static/js/livesupport.js
addons/mail/static/src/js/mail.js
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_demo.xml
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/widgets.js