Merge branch 'master' of https://github.com/ioquake/ioq3
Merge branch 'master' of github.com:mecwerks/ioq3-ios