Merge branch 'master' into divVerent/pangofix-public
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 15:29:54 +0000 (16:29 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 15:29:54 +0000 (16:29 +0100)
commitc4d9df0a2c16b5b2a8b4a67f0139dc78c245de6c
treedfa2f1a3399d5abb0260764c3cf28dfcd4b19d5d
parent8f059eb5924b72c6472611302b5bc6836a9f763a
parentc5639967f05c45018acb45e8db72ad382a217430
Merge branch 'master' into divVerent/pangofix-public