[FFmpeg-cvslog] Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 00:37:32 2014 +0200| [275155081f2e250b707aa89fec21d09dff6bb8d6] | committer: Michael Niedermayer

Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

Conflicts:
	doc/filters.texi
	doc/libavfilter.texi

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

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