* commit '55f03d87':
  hlsenc: Add parameter -hls_allow_cache

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
	libavformat/version.h

See: 3edb9aaeMerged-by: Michael Niedermayer <michaelni@gmx.at>