Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 09:12:33 +0000 (11:12 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 09:12:33 +0000 (11:12 +0200)
commitb5aa7628bfa26e2cbcce07ffe19af8646e3e3cfb
treee045b3a25d7a60a63026a98fb8f97d79d1b83375
parentbbab01747d3702cc0041eff97ba2ea9736fdb47a
parent041b62db8b73a00091b507f73d434a60263a7fb0
Merge branch 'master' into 0.11
gst/rtsp-server/rtsp-client.c
gst/rtsp-server/rtsp-media.c