From: Samual Date: Sat, 20 Aug 2011 06:44:44 +0000 (-0400) Subject: Merge remote branch 'origin/master' into fruitiex/animations X-Git-Tag: xonotic-v0.6.0~40^2~76^2~2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=585387cb47119277a6c3edfeea4a9bcff17481f8 Merge remote branch 'origin/master' into fruitiex/animations --- 585387cb47119277a6c3edfeea4a9bcff17481f8