Merge commit '38516ad367128d83f9e156529018adb4433cd328' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 00:48:57 +0000 (00:48 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 00:48:57 +0000 (00:48 +0000)
commit61d3a215a086d3830667fc9149410ea1f3de3847
tree6f11bd0aa53d3d8808dd995c557aa42667e45dd3
parent583342271f3eec9b2c882006736f44c9c75f0b9a
parent38516ad367128d83f9e156529018adb4433cd328
Merge commit '38516ad367128d83f9e156529018adb4433cd328' into 0.11

Conflicts:
ext/pulse/pulseaudiosink.c
gst/audioparsers/gstmpegaudioparse.c
ext/flac/gstflacenc.c
gst/audioparsers/gstmpegaudioparse.c