[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10050 revid:dle@openerp.com...
authorDenis Ledoux <dle@openerp.com>
Fri, 16 May 2014 12:54:00 +0000 (14:54 +0200)
committerDenis Ledoux <dle@openerp.com>
Fri, 16 May 2014 12:54:00 +0000 (14:54 +0200)
1  2 
addons/account/account.py
addons/auth_oauth/auth_oauth_data.xml

Simple merge
Simple merge