[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 19 Dec 2013 10:45:29 +0000 (11:45 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 19 Dec 2013 10:45:29 +0000 (11:45 +0100)
commiteea3942247d318f032383e27f0badd0e5bd85f5b
tree9dc82ef42057d4e3b033c568f2978ab0ca99ca15
parent586e8984fe43010f0ae3ec597a001fd7892a0a67
parent54be818a3b02d4f9548c00ffc2a74c3cc28b5798
[MERGE] from trunk

bzr revid: fva@openerp.com-20131219104529-pm5covlh6uvo992d
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/static/src/js/devices.js