[FFmpeg-cvslog] Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  7 20:34:24 2015 +0200| [9c37c81246146ef45bba59546cc611a6e26a5b21] | committer: Michael Niedermayer

Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'

* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae':
  parseutils: Make av_small_strptime public

Conflicts:
	doc/APIchanges
	libavformat/utils.c
	libavutil/parseutils.c
	libavutil/version.h

See: 29e972f67c914d35417bc7368493d2617abdd26e
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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