[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 5 Jan 2012 13:06:49 +0000 (14:06 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 5 Jan 2012 13:06:49 +0000 (14:06 +0100)
commitcc554cab231149e8205db6aedaf91ca2c0d5961f
tree62f7626031378c86b25b58370dc2fec42607c809
parentb1b2401034f5066a5d3069a027a98ae5b646c40b
parent4cd7dc6e3bb4b8f8ed5e9188d77f6ad80771408e
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120105130649-peftu9zzz6698wvl
addons/point_of_sale/static/src/js/pos.js