Merge remote-tracking branch 'origin/Mirio/glowplant'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:22:45 +0000 (13:22 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 17:22:45 +0000 (13:22 -0400)
commit35c43f6f7bbfcc21faa4b5035d577c88e931d942
treee865ab9b9cff3db2daa82200e6af123bf4677919
parenta6d428f96a06e90191eeb9a468279595c6802d14
parent28abfde68d37472907a3864f2eb7d93a2cbdf205
Merge remote-tracking branch 'origin/Mirio/glowplant'