Merge branch 'master' into performance

This commit is contained in:
Erik 2015-03-20 20:25:53 -04:00
commit b8b12313fa

View File

@ -38,4 +38,4 @@ import Foundation
func pollingDidFail(err:NSError)
func webSocketDidCloseWithCode(code:Int, reason:String, wasClean:Bool)
func webSocketDidFailWithError(error:NSError)
}
}