[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 28 14:07:34 2013 +0200| [f0308af5fac9f009ed05044bb3e2749a8868d8a3] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: cosmetics: Consistently format list and table items

Conflicts:
	doc/developer.texi
	doc/fate.texi

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

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