Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 6 Jan 2010 10:33:03 +0000 (11:33 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 6 Jan 2010 10:33:03 +0000 (11:33 +0100)
commit951b8516f1229fa029df45c8b810223433ee7cfe
tree9ed0d7139ce2438a7eab7a401741132badba3b73
parent22939b074c028ed1fb71ef91b0dcdaa6a8545d5d
parent15fb8f9bf74939a093037057d3866b65519fd239
Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-base