[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 22 Mar 2013 13:51:52 +0000 (14:51 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 22 Mar 2013 13:51:52 +0000 (14:51 +0100)
commit1683fc7abd3d204408c3c857ff7612a56125ed7f
tree30ca7a221e025a1565fec3384a99ed596db03eb6
parent5c9b5e4ac352a59674ff7686d0c9cbc7163907ba
parent067cd7d15a86205fec0ae9d47f39f86b1e70ffd9
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20130322135152-1hdlptwj1qqqfz4z
doc/changelog.rst
openerp/addons/base/ir/ir_actions.py
openerp/netsvc.py
openerp/tools/convert.py