merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 11 Apr 2013 15:45:19 +0000 (17:45 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 11 Apr 2013 15:45:19 +0000 (17:45 +0200)
commit841cf5aaade65145336b7e942c333eeafa133c18
tree15e00c526847a5fb0b2ede6e1d4966056d54e524
parent16289266c99096a1770fd6039539da26a0ce7c0f
parent63167859c15effcb93d525d12cd971c6ba695845
merge upstream

bzr revid: chs@openerp.com-20130411154519-xvepmjrm4ibqddx7
openerp/addons/base/i18n/tr.po
openerp/addons/base/res/res_config.py