Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:31:38 +0000 (15:31 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 2 Apr 2012 13:31:38 +0000 (15:31 +0200)
commit27739c4a3c3bf8ce4ae7826b112363882087b193
tree2258b7c7a2172b5117e7a1ff6669d6ca82491846
parent2f53680369482d340b5ffaae92a5b56b54816d71
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/mpegtsdemux/tsdemux.c