Merge branch 'master' of git.hacksaar.de:hacksaar/haxotel

player.py

@@ -53,6 +53,7 @@ class Player(Thing):
 		assert self.conn == conn, "The player's connection changed?"
 		data = conn.recv(1024)  # Should be ready
 		if data:
+			data = data.replace(b'\r', b'')
 			self.buffer += data
 			pos = self.buffer.find(b'\n')
 			while pos >= 0: