[FFmpeg-cvslog] Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  8 22:12:57 2014 +0200| [6daff3bd8f30881d489aefebeca13f87f5290337] | committer: Michael Niedermayer

Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

* commit '1ec335513f95bf2441f81d761ea127325ecd81a0':
  time: Add missing zero

Conflicts:
	libavutil/time.c

See: ebef9f5a56d7df91e010a177a80cfc8dbe394305

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

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