Merge remote-tracking branch 'origin/sev/simpleitems_postfix'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 9 Sep 2014 11:51:34 +0000 (13:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 9 Sep 2014 11:51:34 +0000 (13:51 +0200)

Trivial merge