Merge branch '0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Thu, 29 Mar 2012 16:55:44 +0000 (12:55 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Thu, 29 Mar 2012 16:55:44 +0000 (12:55 -0400)
commit1728704d09636d5b2bdce4863e50aca9fb9135f8
treefa5ce5961bb69c210e3a4fa0f270e0d15f738655
parentfa44d050f52468e1b8ad930f03fd0188946b0170
parent148e7ef411c4422eaac1744ca9858dc3699ad399
Merge branch '0.10'

Conflicts:
bindings/python/ges.defs
docs/libs/ges-sections.txt
ges/ges-timeline-layer.c
ges/ges-timeline-object.c
ges/ges-timeline.c
ges/ges-track-object.c
ges/ges-track.c