[FFmpeg-cvslog] Merge commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  8 12:45:24 2013 +0100| [adc7296aa5b2f1027f55e14b556129b72080f389] | committer: Michael Niedermayer

Merge commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305'

* commit 'b5f9b9ac3681acb06d95530f34660ba9fe225305':
  doc: Merge disjointed bits about emailing patches

Conflicts:
	doc/developer.texi

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

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