Merge remote-tracking branch 'origin/ablu/bumblebeefix'
authorSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)

Trivial merge