[MERGE] Merge with fixed autosize_textarea branch
authorvta vta@openerp.com <>
Fri, 31 Aug 2012 10:55:42 +0000 (12:55 +0200)
committervta vta@openerp.com <>
Fri, 31 Aug 2012 10:55:42 +0000 (12:55 +0200)
commit843f1c503f83b55be1be6083e9decaf86d232178
treedf8745b0232c81d66a52ea591b4d481fc384937a
parent1262c81fc7e8a0b2b72554842567068e16fbb71e
parent34fcb826028538f09e58c72d8ac4ce22fbc04de9
[MERGE] Merge with fixed autosize_textarea branch

bzr revid: vta@openerp.com-20120831105542-bnwst8a2v8g2qb8x