[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 09:56:59 +0000 (11:56 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 09:56:59 +0000 (11:56 +0200)
commitf4b6f015b30c34bf7474ca7f0ec10a123d509859
tree31e58f8f71cf0d9f71aed2b4be1c559fd87c5a5a
parentdf107e19ec3e51827721f96557dd97927c23126d
parentf702b4210517b8277d053276ca82095883bfa602
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121022095659-j1w8tdkkmwuhuniq
doc/conf.py
openerp/addons/base/res/res_users.py
setup.py