Merge remote-tracking branch 'origin/debugger/glowplant'
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:58:11 +0000 (11:58 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:58:11 +0000 (11:58 -0400)
commita5916ec3055610d8cf07f27ee74999083416b73b
tree148c9d021a8bb2994c400011d81c2805ea12d6d3
parent38139c64e4b8f016f0811b53329b4168c44743ad
parentdc41c166f81904e22bd97f772a9295b7bdd2f877
Merge remote-tracking branch 'origin/debugger/glowplant'