[MERGE] merge with 7.0 branch

Browse Source

bzr revid: nwi@openerp.com-20121227133425-y058smlf2jo6mbqv

...

This commit is contained in:

Niko

2012-12-27 14:34:25 +01:00

parent cde9308d02

commit f0700b4498

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