[MERGE] branch merged with openobject-server
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Tue, 13 Mar 2012 10:21:26 +0000 (15:51 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Tue, 13 Mar 2012 10:21:26 +0000 (15:51 +0530)
commit93ee53265bbdaf01d6f6b0684f6c2d9b66900c03
tree67ed2e4a531a9ac4f8664f39917a9dadba3582c3
parentc8ca65829e19e4d350ab5c6217267b114548f4d6
parent0d81febc816429f7cc39441e832422b2ae72e105
[MERGE] branch merged with openobject-server

bzr revid: mtr@tinyerp.com-20120313102126-lnzrwll9yjuadm9y
doc/_templates/sidebarintro.html
doc/conf.py
doc/index.rst
openerp/addons/base/i18n/gu.po