[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 15 Aug 2012 18:29:06 +0000 (20:29 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 15 Aug 2012 18:29:06 +0000 (20:29 +0200)
commit306053a41e882b70e050cba2ecb3102ba1034240
tree6d1edc915633e6f9f6feb8df533df9367782abca
parentdab2e03c6281dbcb018800f0f095f60f5932db00
parentd85a88bfd2fee641cf195f7e4095ee1d17696b38
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120815182906-irmi67sqm0gdsnmy