Merge remote-tracking branch 'origin/0.10'
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Tue, 10 Apr 2012 09:57:53 +0000 (11:57 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Tue, 10 Apr 2012 09:57:53 +0000 (11:57 +0200)
commitea397f60e437a528a499288a4bdffbc626031deb
treeaad22b354bd94cb0f970f302f4ef039c72148278
parente09ae5736d58df9fb6ea9ba6aebafee797f60919
parentdfda34ea24b1270610b94d959d3da1bb635fa0cb
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/flv/gstflvdemux.c
gst/matroska/matroska-demux.c
gst/flv/gstflvdemux.c
gst/matroska/matroska-demux.c