[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 10:17:16 +0000 (12:17 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 10:17:16 +0000 (12:17 +0200)
commit218d25b1308f2a1a09a8eacaea91fd4ad65439d8
treef062b96753e1e9b46600892dc0df5947646a9a4c
parent3d1defaa681381eeade85bc7ec236d7be4a2d876
parentf5f1276a71ff1bd1104d766b2db40a76e1f6dbae
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121022101716-491hv1k50abqd8k9
doc/conf.py
setup.py