[MERGE] merger with lp:openobject-server
authorNimesh (Open ERP) <nco@tinyerp.com>
Thu, 11 Oct 2012 05:54:44 +0000 (11:24 +0530)
committerNimesh (Open ERP) <nco@tinyerp.com>
Thu, 11 Oct 2012 05:54:44 +0000 (11:24 +0530)
commit69ecfa1480b84f637ec6d7be2dc2eb907a47b3c9
tree709bf48bd782b40fa5458b0ba69cd4fb6a371533
parentb5f0bc1257a0b782ebe212f1d32625c50f6a9926
parent407979d8d33653274320dc0cf9ef9ac4b0815dd5
[MERGE] merger with lp:openobject-server

bzr revid: nco@tinyerp.com-20121010052400-tp470p0h1yexump1
bzr revid: nco@tinyerp.com-20121011055444-th5ddxs1kw8cjtk9
doc/conf.py
openerp/addons/base/res/res_users.py
setup.py