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)
commit1ace8f7406da1c1af6d0a53be9ec4804c3b295a8
tree536396aa5aba491ca09b6adf7231c561ca609f32
parent9007aeb5a6ec853fed0b5b54a88b32404094389b
parentf0d66ec5c68194cdd2b10a346877ce53d601e1ec
Merge branch 'master' into master-pos-restaurant-fva