Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:02 +0000 (23:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:02 +0000 (23:20 +0000)
commit2a78a3010d2d2f34ef3ebf4292a6029a40db6e08
treed9056987d853d5883d148d66827a60f78b664f2c
parentf949930621ab8e9c1281e686b4e2cb50e35af0f5
parent26d6add9457f00ce8ec13844368466f0e3816e5d
Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11

Conflicts:
ext/rtmp/gstrtmpsink.c
ext/rtmp/gstrtmpsink.c
ext/rtmp/gstrtmpsrc.c