[MERGE]: Merge with lp:openobject-server
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Fri, 12 Oct 2012 05:17:42 +0000 (10:47 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Fri, 12 Oct 2012 05:17:42 +0000 (10:47 +0530)
commit0a44106cff15b6bb947ca61f4fd77d275ae8ec2a
tree93fd6ae94076916fbf630887afe039eca671cfe0
parent92d7b599cf9dd9087b57386cbb7514dc2f9d91b7
parent53e6a97f3375b028b334beaa4e872bcc3860bbd3
[MERGE]: Merge with lp:openobject-server

bzr revid: mma@tinyerp.com-20121010054128-vxfn678x1d7i23qy
bzr revid: mma@tinyerp.com-20121012051742-ds6ve0vsa08zzc3v
doc/conf.py
openerp/addons/base/res/res_country_view.xml
setup.py