Merge pull request #17 from WyseNynja/master
authorThomasV <thomasv1@gmx.de>
Mon, 14 Jan 2013 01:19:23 +0000 (17:19 -0800)
committerThomasV <thomasv1@gmx.de>
Mon, 14 Jan 2013 01:19:23 +0000 (17:19 -0800)
pep8

1  2 
server.py

diff --cc server.py
Simple merge