[FFmpeg-cvslog] Merge commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 11:03:30 2014 +0100| [66030e8133d1e874c255c767f12d9afc84273218] | committer: Michael Niedermayer

Merge commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7' into release/2.2

* commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7':
  matroskaenc: allow override of "writing application" tag

Conflicts:
	libavformat/matroskaenc.c

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

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