[merge] merge with trunk but excluding the revert made in trunk

Browse Source

bzr revid: nicolas.vanhoren@openerp.com-20120208111253-4p73dcczzpf80czu

...

This commit is contained in:

niv-openerp

2012-02-08 12:12:53 +01:00

parent 0cb4b56b80 44263a42b2

commit affc2d4d04

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