From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 16 Sep 2014 16:28:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'cehoyos/master'
X-Git-Tag: n2.6-dev~1465
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/a07b0ffdc3424b729238d3cbd0673af9095a90f6

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a closing LF to Webm-manifest files.

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

a07b0ffdc3424b729238d3cbd0673af9095a90f6