Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:22:58 +0000 (14:22 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:22:58 +0000 (14:22 +0000)
commitd06ad8e95e79514dbd0991c566c141a82d4dfae6
treef5d07e8e67ae26de9d13c083bf5294339b45ee91
parent220ccdf2755e545ba6486827dcb59d3e26ba7868
parentb6c424018bc6ab410c8123d134a9781918e70ffa
Merge remote-tracking branch 'origin/master' into 0.11
gst/playback/gstsubtitleoverlay.c