Merge branch 'master' into itsme/vorix
authorItsMe <itsme.xonotic@ymail.com>
Sat, 9 Apr 2011 09:58:40 +0000 (11:58 +0200)
committerItsMe <itsme.xonotic@ymail.com>
Sat, 9 Apr 2011 09:58:40 +0000 (11:58 +0200)
commite6be0e1fef56f67dcfb8196f77c5b4a351182989
treed9cc2feb8daeb7022824b6eac2d32ba142676e65
parenta0608cddd73f0ced4f7a9b5063aa983928798dc8
parentafdbed21824891bcc8185b951c6d232313d349cf
Merge branch 'master' into itsme/vorix