Merge remote-tracking branch 'origin/samual/no_dead_airshots'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)
commit7f2227f07a84c570ba8e289d313c7da3453fb55f
tree78ccae301434caa7811c80a1a5c63443d54644c5
parentda5dbb0754627a2b1711b91f09c5a629a36bd728
parentc414b7f0f3e2297640d07576e5cc258bc22e756b
Merge remote-tracking branch 'origin/samual/no_dead_airshots'