[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 9 Jan 2014 10:13:13 +0000 (11:13 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 9 Jan 2014 10:13:13 +0000 (11:13 +0100)
commit7ab7cf2149c84f5d3c9a7866b4320be271fac97c
treebb5530af43a6302e9dfbfe3887c4c75275d676a9
parenta726bf2d7655334f8425d328dd5c7f67fcc89d1a
parentced63415b7319e12fb9d31a3e370850278f697c1
[MERGE] from trunk

bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
addons/base_calendar/i18n/he.po
addons/crm_todo/i18n/he.po
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml