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)
commitb50bee2617551ff6075a8d9ad6a5c2131f65d5f5
tree343be11dda406134d1f9efaa7b4dc95fc4528405
parent439e2f1cfd1d54842998b2f963a13ba498b1cd7a
parentc363ae82547a73c89bfb51c7ef1f4a8e78bb0f67
Merge remote-tracking branch 'origin/master' into 0.11
gst/matroska/matroska-mux.c