Merge remote-tracking branch 'origin/Mirio/afterslime'
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:23:43 +0000 (12:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:23:43 +0000 (12:23 -0400)
commit5f5b63ec0f760cac57a2f84709c624396cb94b7f
treece6b6be02697f3411e60f5d0ccee25482dcf89d7
parent59bd30b72a6a5b1eb0e0154c508a318782d16e11
parent754a7504ebe3eb119f40160d942fda2c3162a3a9
Merge remote-tracking branch 'origin/Mirio/afterslime'

Conflicts:
maps/afterslime.map.options
maps/afterslime.map.options