Chris Lu f7998f8652 merge conflicts

2015-02-07 15:35:28 -08:00

..

guard.go

merge conflicts

2015-02-07 15:35:28 -08:00

jwt.go

merge conflicts

2015-02-07 15:35:28 -08:00