Fri, 28 Oct 2011 18:33:38 +0200 merge hedgeroid
Xeli [Fri, 28 Oct 2011 18:33:38 +0200] rev 6226
merge
Sat, 29 Oct 2011 09:19:04 +0200 disconnect when going back from lobby page (regression fix)
sheepluva [Sat, 29 Oct 2011 09:19:04 +0200] rev 6225
disconnect when going back from lobby page (regression fix) fix some indentations
(0) -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 tip