From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 13 Aug 2011 03:44:49 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/mand1nga/bot-fix-aiming-origins'
X-Git-Tag: xonotic-v0.5.0~148^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55ac7522bd722c28ad63777168e35532c15bed55;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/mand1nga/bot-fix-aiming-origins'
---

55ac7522bd722c28ad63777168e35532c15bed55