Merge branch 'master' into master-pos-restaurant-fva
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Wed, 2 Jul 2014 12:05:45 +0000 (14:05 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Wed, 2 Jul 2014 12:05:45 +0000 (14:05 +0200)
commit8e6fab5447adddd3f774f05d81f4c08c160c4877
tree9a1ae0325540980aec0a38dad90d87d5ebd42604
parentcab5fdf4f38fb21347c339faefb4d00efde529ac
parent58481cee00291b4be525ebe956a4eaf4ab602dfa
Merge branch 'master' into master-pos-restaurant-fva