Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2013-01-08 21:14:34 -08:00
commit f04f4e4a1a

View file

@ -87,7 +87,7 @@ class EXTERNAL(Mech):
return self.credentials['authzid']
@sasl_mech(30)
@sasl_mech(31)
class X_FACEBOOK_PLATFORM(Mech):
name = 'X-FACEBOOK-PLATFORM'