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 11:44:36 +0000 (13:44 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Tue, 1 Jul 2014 11:44:36 +0000 (13:44 +0200)
commit94c23e16d51a0c6f9df07c58abd98dcbe2951173
tree2276dd847b131642ef1ffd71c0092eecf1bfac29
parent7842b628809f2590cc9ed3e19f4b4820ed6d37b6
parenta3aa8616a86e44f493064e622f5cd712af86bb90
Merge branch 'master' into master-pos-restaurant-cleanup-v8-fva