projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25e4a10 f2a2a8c)
Merge branch 'master' into master-pos-restaurant-cleanup-v8-fva
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Tue, 1 Jul 2014 13:15:53 +0000 (15:15 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Tue, 1 Jul 2014 13:15:53 +0000 (15:15 +0200)

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