Merge remote-tracking branch 'origin/ingar/texture_layout_defaults', fixes #1711
authorRudolf Polzer <divverent@xonotic.org>
Sat, 6 Jul 2013 16:58:56 +0000 (18:58 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 6 Jul 2013 16:58:56 +0000 (18:58 +0200)

Trivial merge