Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good...
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 6 Dec 2010 16:28:32 +0000 (17:28 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 6 Dec 2010 16:28:32 +0000 (17:28 +0100)
commit83ed1deda9f2b1e0788f8dffd4bb49a1e10afc8a
tree44e0f8ef7e100d7668206bfcd2f06efc744f1848
parentcca88cdb475e95d9944d3a479a811a9b1cbeac6c
parent6e7474459a2eca111af737a5d2e063bb7bd1313d
Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good into 0.11