From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Mon, 12 Dec 2011 12:40:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into 0.11
X-Git-Tag: 1.19.3~511^2~7057
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bec783380681d870806666e49255d2196af9ed1;p=platform%2Fupstream%2Fgstreamer.git

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
---

6bec783380681d870806666e49255d2196af9ed1