[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Thu, 27 Feb 2014 10:17:25 +0000 (11:17 +0100)
committerFabien Meghazi <fme@openerp.com>
Thu, 27 Feb 2014 10:17:25 +0000 (11:17 +0100)
commit2868e9a6acc7688eeaf3b5a8199eddb3a263be6e
tree3ce93cfdda9546b0aad2032b016c7df1d799c197
parent33bfec21743c9200f491bd0ddcc6d368cd948f85
parent3324351bf60d83d91f3ee8495653ca4b1b74a60f
[MERGE] upstream

bzr revid: fme@openerp.com-20140227101725-7egd9xq859jasnhj
addons/auth_oauth/controllers/main.py
addons/auth_signup/controllers/main.py
addons/auth_signup/res_users.py
addons/website/controllers/main.py