Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:30:04 +0000 (15:30 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:30:04 +0000 (15:30 +0200)
commit3601e80e83273fe6d1fd96386eb505a34d6a10dd
tree4925eefc92faf8aaf7fd34123ca5799e4620e5ff
parent98e1463411df740c23668fc3c3075e9ce2f1b1d7
parentdf6d0b06969f9fe2cc8a6238bca7a4a57c17e621
Merge remote-tracking branch 'origin/0.10'

Conflicts:
libs/gst/base/gstbaseparse.c