-
Merge branch 'inedit_mc' of https://github.com/sletz/libaudiostream into inedit_mc

Conflicts:
	macosx/LibAudioStreamMC.framework.zip