[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5059 rev-id: dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Wed, 28 Aug 2013 13:54:25 +0000 (15:54 +0200)
committerDenis Ledoux <dle@openerp.com>
Wed, 28 Aug 2013 13:54:25 +0000 (15:54 +0200)
commit055c4b94f23635bc0480d506405e3a7faa1a5c36
tree03c4ddc469c04058ac381216e1492e5e435c4c3e
parent20e5751e6275e8cd03f9996a843d141705926f44
parent57818bb779374597d561f33faa092d0e0061f8a0
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5059 rev-id: dle@openerp.com-20130828125209-5jqwjqhrl17x7kpa

bzr revid: dle@openerp.com-20130828135425-yuls3wav79znadt3
openerp/addons/base/res/res_config.py
openerp/addons/base/res/res_partner.py