[FFmpeg-cvslog] Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 28 21:47:32 2014 +0200| [1fc396318833280a520bf568d5605791decf87d7] | committer: Michael Niedermayer

Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
	libavdevice/x11grab.c

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

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