projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bac7c07 ccdae74)
Merge branch 'upstream/master'
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 10 Jun 2014 13:20:16 +0000 (15:20 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 10 Jun 2014 13:20:16 +0000 (15:20 +0200)

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