Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Jan 2010 12:18:18 +0000 (13:18 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Jan 2010 12:18:18 +0000 (13:18 +0100)
commit9aeafa25d124d93d0144cb6f4c2b3cc45ac38166
treebd69b5911cfc949f5a92f76ba93498bf3cd5a679
parent62f8c3c6725925bd6db4a7c903c4a8adf4961c92
parentfcf2668b208af31af584a161073019ca4ecf087b
Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base