Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:10:45 +0000 (12:10 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:10:45 +0000 (12:10 +0200)
commitbca1463a666bfc149a5fa2cf2acaa480f15b906a
tree554b6898cf024ea2381444638d4b0eabb89f0895
parentecf09f45f3495861e6583eb9a2101090b02e8d5a
parent94c5f6dcc92fad688c5ed4e33fd93f2cd48e91f0
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-read-common.c
gst/matroska/matroska-read-common.h