[MERGE] Sync with website-al (strange merge)

Browse Source

bzr revid: tde@openerp.com-20131115132821-js9kkwuh25e9qt74

...

This commit is contained in:

Thibault Delavallée

2013-11-15 14:28:21 +01:00

parent 833adcec62 9ca2b8e8e0

commit 029993ea1d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available