Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 10:11:59 +0000 (12:11 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 10:11:59 +0000 (12:11 +0200)
1  2 
gst/rtsp-server/rtsp-client.c

Simple merge