Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 9 Dec 2011 12:15:30 +0000 (12:15 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 9 Dec 2011 12:15:30 +0000 (12:15 +0000)
1  2 
gst/matroska/matroska-mux.c

Simple merge