Merge remote branch 'origin/morphed/hpitems'
authormand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 21:55:42 +0000 (18:55 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 21:55:42 +0000 (18:55 -0300)

Trivial merge