From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Thu, 29 Mar 2012 16:55:44 +0000 (-0400)
Subject: Merge branch '0.10'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1728704d09636d5b2bdce4863e50aca9fb9135f8;p=platform%2Fupstream%2Fgst-editing-services.git

Merge branch '0.10'

Conflicts:
	bindings/python/ges.defs
---

1728704d09636d5b2bdce4863e50aca9fb9135f8