[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 12:17:18 +0000 (14:17 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 12:17:18 +0000 (14:17 +0200)
commit7b6ef161d285789785e9e7927be1cb7e9a1ffaf6
tree1907e49f9aaa72af138dbe947b7307b729aa160e
parent021281bcf95bd72aed6815e1c46b65b596b1c254
parent5554379e1b08a97b9636b0433d1df22e55e91f9e
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121022121718-92ur1vmbrih9j8hy
doc/conf.py
openerp-server
openerp/modules/loading.py
openerp/tests/test_html_sanitize.py
setup.py