Merge pull request #239 from M2Ys4U/key
authorDarren <darren@darrenwhitlen.com>
Thu, 9 May 2013 15:45:31 +0000 (08:45 -0700)
committerDarren <darren@darrenwhitlen.com>
Thu, 9 May 2013 15:45:31 +0000 (08:45 -0700)
Add option to enter channel key on server selection screen


Trivial merge