Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Thu, 5 Dec 2013 23:07:31 +0000 (18:07 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 5 Dec 2013 23:07:31 +0000 (18:07 -0500)
commitc4a2201788e1f5b0d3628f7964716f2690cd6cd0
tree628cfc4081a25c911d13037a4499c750a32b1f45
parent09c1b185a9ae264dc06c2ee62adb10cc0c39306a
parentad8f3ce1398d7fa2204c0282b1d0f84838ca0e92
Merge remote-tracking branch 'origin/master' into samual/combined_updates