Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Thu, 5 Apr 2012 21:15:11 +0000 (17:15 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Thu, 5 Apr 2012 21:15:11 +0000 (17:15 -0400)
1  2 
gst/hls/gsthlsdemux.c

Simple merge