[MERGE]: Merge with lp:openobject-server
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Tue, 13 Mar 2012 13:37:08 +0000 (19:07 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Tue, 13 Mar 2012 13:37:08 +0000 (19:07 +0530)
commit85dd5f6164e97583982ed8012f74a87b2da0cd70
treece44a5c57c9eba7f69fd686c5a207e4b4f89a630
parent5bf4aa302a4aa01556dcafc1a02ea4e465e83c3b
parent0d81febc816429f7cc39441e832422b2ae72e105
[MERGE]: Merge with lp:openobject-server

bzr revid: atp@tinyerp.com-20120313133708-lc4x4ekn2xv517b8
doc/_templates/sidebarintro.html
doc/conf.py
doc/index.rst
openerp/addons/base/i18n/gu.po
openerp/modules/loading.py