[Merge] lp:~zulcss/keystone/2014.1.b1 into lp:~ubuntu-server-dev/keystone/havana

[Adam Gandelman]

Attempt to merge into lp:~ubuntu-server-dev/keystone/havana failed due to conflicts: 

text conflict in debian/patches/disable-oauth2.patch
text conflict in debian/patches/fix-ubuntu-tests.patch
-- 
https://code.launchpad.net/~zulcss/keystone/2014.1.b1/+merge/197955
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/keystone/havana.