Merge remote-tracking branch 'origin/master' into samual/fix_deathfade
authorSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)
commitab18855f2de6204798b29f9a7f2adc6382d39d1b
treee81d9060a59c92f26029b6c83c71f063d9dad69a
parentf7da9a3b9e31c678c9b4228be48699bc13a98f0d
parent6baaca28bc15a710c5dc79feb64685356048592b
Merge remote-tracking branch 'origin/master' into samual/fix_deathfade