Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege_bad_texture_fix' xonotic-v0.7.0
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 20:55:28 +0000 (16:55 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 20:55:28 +0000 (16:55 -0400)

Trivial merge