[MERGE] from trunk

bzr revid: fva@openerp.com-20120920115126-0lydpibguzfu6zm4
This commit is contained in:
Frédéric van der Essen
2012-09-20 13:51:26 +02:00
8 changed files with 138 additions and 2907 deletions
File diff suppressed because it is too large Load Diff