* commit '729d821f':
  libmp3lame: allow joint stereo to be disabled

Conflicts:
	libavcodec/libmp3lame.c
	libavcodec/version.h

See: 1de11a7cMerged-by: Michael Niedermayer <michaelni@gmx.at>