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)
commit8b8d39b3632247acb8705a4f397125ca2a589b11
treee550990c883d03b73da03fc190013f553c89a6ba
parentc540b45911a2ff6f698254c8ba1d24a659b5d4e9
parentaf70ac3f1020e5b989fe889bd69b79cfd2b19c47
Merge remote-tracking branch 'origin/Mario/hagar_load_fix'