[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Thu, 16 Aug 2012 10:48:04 +0000 (12:48 +0200)
committerVo Minh Thu <vmt@openerp.com>
Thu, 16 Aug 2012 10:48:04 +0000 (12:48 +0200)
commitabb47bc6d66348a8cf86f88544a62eeaefa397cd
treebb1ee51cbe3be6c31ba20156f36217605b7a4d60
parent389257c0090a9bcd00ff22079e9fff2b32b2f59a
parent5f866fbacd3267d0317bb2e9400a3303850b0f21
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120816104804-k5pwjk3j3um5mow7
.bzrignore
doc/_templates/sidebarintro.html
doc/conf.py
doc/index.rst
openerp-server
openerp/modules/graph.py
openerp/modules/loading.py
openerp/tests/test_html_sanitize.py