fixes a conflict with WP 3.5 shortcode handling#3

aschweigert wants to merge 2 commits into

argoproject:masterargoproject/argo-audio-player:masterfrom

INN:masterINN/argo-audio-player:masterCopy head branch name to clipboard