Merge remote-tracking branch 'origin/morphed/pillar', closes #1256
authorRudolf Polzer <divverent@xonotic.org>
Tue, 29 Jan 2013 19:33:06 +0000 (20:33 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 29 Jan 2013 19:33:06 +0000 (20:33 +0100)
commitd38c1f7121d3bd768216a8fe9e163a54e9cb3b9b
treeb749da16e4aca91b73e391522dfb72a8a966d5bc
parente4ae40ec5b40e863e0f76e583fd33b2044ed2191
parent98bf0d2ac8432fe77bf942d73c29be26532126da
Merge remote-tracking branch 'origin/morphed/pillar', closes #1256