[MRG] merge with lp:openobject-server
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 23 Oct 2012 09:06:42 +0000 (14:36 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 23 Oct 2012 09:06:42 +0000 (14:36 +0530)
commitb7ad28bfa7cf307d2c12a05e81c5bb5e1c699da3
tree3f14fbe50eaf15f59cb5517de6e9c8b0e9098df3
parent620453c4a04822af52f25449433dcfd1a0c848e5
parent7501a8b9add278ecb1ed9359901d7cfa29b42c30
[MRG] merge with lp:openobject-server

bzr revid: tpa@tinyerp.com-20121023090642-jxdz69nggy5w1pg4
doc/conf.py
setup.py