Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:17:11 +0000 (15:17 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:17:11 +0000 (15:17 +0100)
commitf8506e1c90d908371e4c43b797efaf5e1b9dfce6
tree68d4a144ce74b10076864cc4084e1dfd0de0ea12
parent8404c29a422e0d5deb986199dd87fff98b0f7642
parente0fc333b3f231a84904b8d447b41b9e3abac4baf
Merge branch 'master' into 0.11

Conflicts:
ext/a52dec/gsta52dec.c
ext/a52dec/gsta52dec.h
ext/lame/gstlame.c
ext/lame/gstlame.h
ext/lame/gstlamemp3enc.c
ext/mad/gstmad.c
ext/mad/gstmad.h
gst/mpegaudioparse/gstmpegaudioparse.c
gst/mpegstream/gstdvddemux.c
gst/realmedia/rdtdepay.c
po/es.po
po/lv.po
po/sr.po
ext/lame/Makefile.am
ext/lame/gstlamemp3enc.c