]> git.rm.cloudns.org Git - voretournament/voretournament.git/commitdiff
Merge branch 'master' of ssh://git.xonotic.org/~/repo/voretournament
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 23 Aug 2011 20:37:03 +0000 (23:37 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 23 Aug 2011 20:37:03 +0000 (23:37 +0300)

Trivial merge