Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:12:21 +0000 (15:12 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:12:21 +0000 (15:12 +0200)
commite9ef6f6254f0c9a1e6e7008e93a8c03a47fa675b
tree837eafef78e1a823c04c4e539d0626d18c4960f0
parented1642b997d976c47a33b292b865d1e9c8674d77
parent1f442d45b63be0ceacec801aee6eec7af540790a
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/rtsp-server/rtsp-session-pool.c
gst/rtsp-server/rtsp-session-pool.c