[MERGE] forward port of branch 7.0 up to revid 5113 launchpad_translations_on_behalf_...
authorChristophe Simonis <chs@openerp.com>
Thu, 31 Oct 2013 14:21:25 +0000 (15:21 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 31 Oct 2013 14:21:25 +0000 (15:21 +0100)
commit82211b1ac22cdc1150d7c2144b1ae9ce9008716b
tree8a3433ebe5b3436fd66579faea5473a06f63e5ca
parent9134b1b6d72e757799be903c269e474f3792aea2
parente3c98d3b5bdb69902e9838178f586afc185c0250
[MERGE] forward port of branch 7.0 up to revid 5113 launchpad_translations_on_behalf_of_openerp-20131031054724-b9dbttdcrl9eccwr

bzr revid: chs@openerp.com-20131025103657-pbnqhw11mygyi5jn
bzr revid: chs@openerp.com-20131031142125-7bm00z2jpccf3v6f
openerp/addons/base/ir/ir_attachment.py
openerp/addons/base/res/res_config.py
openerp/osv/fields.py