Merge branch 'master' into TSP

Author Patrick Branch <branch.patrick@gmail.com>
Author date 2016-07-30 10:54:31
Author local date 2016-07-30 06:54:31 -0400
Committer Patrick Branch <branch.patrick@gmail.com>
Committer date 2016-07-30 10:54:31
Committer local date 2016-07-30 06:54:31 -0400
Commit aaa38b612ed78355ec0d2158387fb3863f8878f7
Tree 996817b1d81ae8b3b20f16530a2c9c0f9c97d9d9
Parent ef35d61e1ce6d1578dd031c24a75264a00960f88
Parent 42128715ba97430bfc7f1bfd6bbb7265696c3d88
Merge branch 'master' into TSP
Affected files:
PokemonGo/RocketAPI/Client.cs
PokemonGo/RocketAPI/PokemonGo.RocketAPI.csproj
PokemonGo/RocketAPI/Window/MainForm.cs
You may download the files in Public Git.