merged CiaranG's changes (player privileges)
authorPerttu Ahola <celeron55@gmail.com>
Mon, 16 May 2011 16:39:15 +0000 (19:39 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Mon, 16 May 2011 16:39:15 +0000 (19:39 +0300)

Trivial merge