Merge remote-tracking branch 'origin/cbrutail/textures-facility114inx-additionals'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 18 Oct 2011 13:18:57 +0000 (15:18 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 18 Oct 2011 13:18:57 +0000 (15:18 +0200)

Trivial merge