Merge remote-tracking branch 'origin/Mario/hagar_load_fix'
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)

Trivial merge