Merge branch 'master' into itsme/vorix
authorItsMe <itsme.xonotic@ymail.com>
Tue, 21 Jun 2011 23:06:06 +0000 (01:06 +0200)
committerItsMe <itsme.xonotic@ymail.com>
Tue, 21 Jun 2011 23:06:06 +0000 (01:06 +0200)
commit782794f10842c9d5eb029971de2966fb82c10fd8
treecf182f89d6b522b1f17cb8dc9188e73f1635b308
parentc331d4ce792cf7180c7bdf74eb8081265830d05f
parent9b55b717831f3fa3cd0e4fd0b6dbec56bad19e58
Merge branch 'master' into itsme/vorix