[MERGE]TRUNK.
authorVidhin Mehta <vme@tinyerp.com>
Mon, 28 Jan 2013 05:44:26 +0000 (11:14 +0530)
committerVidhin Mehta <vme@tinyerp.com>
Mon, 28 Jan 2013 05:44:26 +0000 (11:14 +0530)
commit871931667e9e01ff39aacc0a549436699a6fb71c
tree305b39dd22110155fa3a86a67735ec3a3aac136c
parent3cdad18c64be6081c03dbee76b1452dfb543a140
parent4144c0fc76fc98ef1a930a6a0019b97ef1390b53
[MERGE]TRUNK.

bzr revid: vme@tinyerp.com-20130128054426-spazi5lweiqv59s8
openerp/addons/base/res/res_country.py