From: mand1nga <mand1nga@xonotic.org>
Date: Fri, 22 Apr 2011 00:57:19 +0000 (-0300)
Subject: Merge remote branch 'origin/mand1nga/fix-bot-wandering'
X-Git-Tag: xonotic-v0.5.0~264^2~28^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2f8fbe4288f6410da5cc64299a9dab06673022bc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/mand1nga/fix-bot-wandering'
---

2f8fbe4288f6410da5cc64299a9dab06673022bc