projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a51ae8e cf9230d)
Merge remote-tracking branch 'upstream/master'
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 13 Aug 2014 10:15:43 +0000 (12:15 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 13 Aug 2014 10:15:43 +0000 (12:15 +0200)

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