[MERGE] point_of_sale & posbox: new posbox homepage, posbox software upgrade system...
authorFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 13:42:36 +0000 (14:42 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 13:42:36 +0000 (14:42 +0100)
bzr revid: fva@openerp.com-20140326134236-fuwrlti8356dmyp9


Trivial merge