Merge remote-tracking branch 'origin/ablu/vehiclebalance'
authorSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 23:24:54 +0000 (19:24 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 23:24:54 +0000 (19:24 -0400)

Trivial merge