Merge commit '02f5d72a0519bcbe8f6958fab6dd998fc8ccda6b' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 00:34:09 +0000 (00:34 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 00:34:09 +0000 (00:34 +0000)
commit42d53650fae19f27fb9b3ed5ff01ee1d82048f1d
tree79b2e2e5832c4588363482c45f811a0c71379e41
parent829301f1e458a22d6e2bdfc1822dd38bcd01dc62
parent02f5d72a0519bcbe8f6958fab6dd998fc8ccda6b
Merge commit '02f5d72a0519bcbe8f6958fab6dd998fc8ccda6b' into 0.11

Conflicts:
ext/mad/gstmad.c
ext/mad/gstmad.c