Merge remote-tracking branch 'origin/mirceakitsune/glowmod_weapons'
authormerlijn <mhofstra@gmail.com>
Fri, 13 May 2011 18:58:29 +0000 (20:58 +0200)
committermerlijn <mhofstra@gmail.com>
Fri, 13 May 2011 18:58:29 +0000 (20:58 +0200)
commit15c235b4f1780fd29cb2df5ccfdc6c4c8016442c
tree592694b2a1111473c4c7ae74a2056f3421ee349b
parentf09691075c4a61f4ab4b81b4354cff95be9ea26f
parent9eb8ffd5a7e69c31bb0980a9d7ed1315798af919
Merge remote-tracking branch 'origin/mirceakitsune/glowmod_weapons'