Merge branch 'master' of

abmar · abmar · commit 533e6bd666aa · 2012-04-20T07:03:31.000-03:00
https://abmargb@github.com/abmargb/lsd-radio.git

Conflicts:
	start-ices.sh
	start-server.sh
diff --git a/start-server.sh b/start-server.sh
@@ -7,4 +7,4 @@ fi
 
 PWD=`dirname $0`
 python server/server.py > server.log 2>&1 &
-echo $! > $PWD/server.pid
+echo $! > $PWD/server.pid
