Merge remote branch 'origin/master' into morphed/hpitems
authorSamual <samual@xonotic.org>
Sat, 5 Mar 2011 06:28:21 +0000 (01:28 -0500)
committerSamual <samual@xonotic.org>
Sat, 5 Mar 2011 06:28:21 +0000 (01:28 -0500)

Trivial merge