Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11

Conflicts:
	ext/rtmp/gstrtmpsink.c
This commit is contained in:
Tim-Philipp Müller 2011-11-28 23:20:02 +00:00
commit d568733375

Diff content is not available