Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Dec 2011 12:40:17 +0000 (12:40 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Dec 2011 12:40:17 +0000 (12:40 +0000)
commit6bec783380681d870806666e49255d2196af9ed1
tree51fee1230010c83b2d9bac7a6cfcc1dd4fe91d0e
parent59d5ad42b03254f5958b3164f82bbc27e457c6b2
parentee93a0c31c7f69ed9a5edda6addf533ae5a23c94
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst-plugins-base.spec.in
po/LINGUAS
po/cs.po
po/eo.po
po/es.po
po/gl.po
po/lv.po
po/sr.po