[MERGE]Latest trunk
authordle@openerp.com <>
Fri, 14 Dec 2012 13:42:54 +0000 (14:42 +0100)
committerdle@openerp.com <>
Fri, 14 Dec 2012 13:42:54 +0000 (14:42 +0100)
commita222759eb62e28f62e735eb13b2cd424a2d317c0
treecb0a5bf86e6581fb6843364f4d1ac367740291d8
parent3eb8273b58294d7b4a3342c66dc0fa2a03daacc7
parent1b800a75a42010825e8e11b4839996305586a2b6
[MERGE]Latest trunk

bzr revid: dle@openerp.com-20121214134254-9ml9dmwgc5bnrujx
addons/stock/stock.py