projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9007aeb f0d66ec)
Merge branch 'master' into master-pos-restaurant-fva
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Wed, 2 Jul 2014 13:04:53 +0000 (15:04 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Wed, 2 Jul 2014 13:04:53 +0000 (15:04 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.