Merge branch 'master' into zykure/teamscores
authorJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:55:03 +0000 (15:55 +0200)
committerJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:55:03 +0000 (15:55 +0200)
commit5b9c815160b06ce5d741df5fb4497242c3419f9a
treeb2512768adcf25b725abaf3be1fde35a55380362
parent885400067025c2585fab245a6c5a268257b77709
parentdd70edcca2f19a7b95b1f0441db75c154bf10606
Merge branch 'master' into zykure/teamscores
qcsrc/server/playerstats.qc
qcsrc/server/scores.qc