eqMerge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 12 Jan 2012 23:48:50 +0000 (23:48 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 12 Jan 2012 23:48:50 +0000 (23:48 +0000)
commit8580dd86c9e73a523cc2a78f10541b330598fa6a
tree3ea54d3bf14462421b6b4dcb1e5759cd142f667f
parente8c254f34d2a375a8469619b53f23a10dd41e206
parent654a04f90c14a05d83ac4f879d541921bbc1f0a8
eqMerge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosrc.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-read-common.c
gst/rtpmanager/gstrtpssrcdemux.c
ext/flac/gstflacenc.c
ext/jack/gstjack.h
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosink.h
ext/jack/gstjackaudiosrc.c
ext/jack/gstjackaudiosrc.h
gst/matroska/matroska-mux.c
gst/matroska/matroska-read-common.c