Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:01:01 +0000 (00:01 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 13 Jan 2012 00:01:01 +0000 (00:01 +0000)
commit87c0b0fd1b2fd633572a5f1779c73c77cfecefda
tree54726ee91c61ce977c3460cbc19f06c1117d8718
parent8cd2408f099b8e1b584fa5cec12bdf956004aa9f
parent2e7b2d8bdfd2cfbef1b4196676190b03f26de4db
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/a52dec/gsta52dec.c