[MERGE] merged changes from 6.0
authorVo Minh Thu <vmt@openerp.com>
Wed, 25 May 2011 15:11:49 +0000 (17:11 +0200)
committerVo Minh Thu <vmt@openerp.com>
Wed, 25 May 2011 15:11:49 +0000 (17:11 +0200)
commit823abab95879013a347df9a3dec6bdaf74a253a2
tree7af304f555dd5eff5c9d1cc0f54563325ed9b364
parentc3f355d2e276e8df94b7661c2145624c06f219c6
parent8156aae67e1c809684dcfb33c70bd71df220665c
[MERGE] merged changes from 6.0

bzr revid: vmt@openerp.com-20110525151149-78gkoolppmjekrl6
13 files changed:
openerp/addons/base/i18n/cs.po
openerp/addons/base/i18n/fr.po
openerp/addons/base/i18n/hy.po
openerp/addons/base/i18n/mk.po
openerp/addons/base/i18n/pl.po
openerp/addons/base/i18n/pt_BR.po
openerp/addons/base/i18n/ru.po
openerp/addons/base/i18n/sv.po
openerp/addons/base/i18n/tr.po
openerp/addons/base/i18n/vi.po
openerp/osv/fields.py
openerp/osv/orm.py
openerp/osv/osv.py