[FFmpeg-cvslog] Merge commit '55f03d872640175a00bfa262da4652b7312b905f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  3 21:43:46 2014 +0200| [883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c] | committer: Michael Niedermayer

Merge commit '55f03d872640175a00bfa262da4652b7312b905f'

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

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

See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c
---