Merge branch 'master' of git+ssh://git.collabora.co.uk/git/gst-rtsp-server
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 4 Feb 2009 19:13:32 +0000 (20:13 +0100)
committerWim Taymans <wim@metal.(none)>
Wed, 4 Feb 2009 19:13:32 +0000 (20:13 +0100)
commit734dedaeac9f39dc470f88a498ecd94f75cdb2fa
treed8c30d23f2df534e3f6bd8d153018c47e1cc2a5a
parent077a31b8dfb9d95ba41f840d7736d6bcd4c5f0a4
parentae9da4c5b088b67a2d9a4c188e4965a3dd63993e
Merge branch 'master' of git+ssh://git.collabora.co.uk/git/gst-rtsp-server