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)
1  2 
gst/rtsp-server/rtsp-client.c
gst/rtsp-server/rtsp-media.c

Simple merge
Simple merge