[FFmpeg-cvslog] Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 16 11:31:11 2015 +0200| [5de28d341f242c6892e4c13d6274100815a5882d] | committer: Hendrik Leppkes

Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'

* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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