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)
commitdb90df6d028fc975d6080e298c59706a81c3bf25
tree061c3f06b16a752b8c357d90c5c4feab809d8335
parentf88f6c18a35eef4a4ee9bb48e35f5f5b92fae6f7
Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11

Conflicts:
ext/rtmp/gstrtmpsink.c