Vanilla/Vanilla — pull request #634 by kitskub (2013-07-02 18:07:28+00:00)
Title: Fix merge error

THIS IS NOW CLIENT-CONNECTION! SORRY!
Signed-off-by: Jack Huey kitskub@gmail.com