Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Sep 2014 20:12:57 +0000 (22:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Sep 2014 20:14:32 +0000 (22:14 +0200)
commit6daff3bd8f30881d489aefebeca13f87f5290337
tree89edc31291144d7f594524ab840ec3cf55295357
parent1360db7e888e7d3c045e39a5645af0a29bc28c80
parent1ec335513f95bf2441f81d761ea127325ecd81a0
Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

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

Conflicts:
libavutil/time.c

See: ebef9f5a56d7df91e010a177a80cfc8dbe394305

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