Merge remote branch 'origin/fruitiex/cuinnton_credits'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)
commit5c13b3af01e247f840b7b3cf85d0e0d217eae4af
tree82bad86d44ab22a5924ee736942a85645f78709c
parent1938f9b89a67e2379577e9b81ac30add9a9845fb
parent5d9276e35ca4f666e58ae435196abb3317be2209
Merge remote branch 'origin/fruitiex/cuinnton_credits'