Merge branch '0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Sun, 8 Apr 2012 02:31:23 +0000 (22:31 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Sun, 8 Apr 2012 02:31:23 +0000 (22:31 -0400)
commit672a162062065e43cb656889bd5fbe8ab3a4030d
tree2917d1a798344f7bf0cdee1d1caa88f6240333c0
parent35e2f8f11154c78b8af9c886ac714a5ebd75ad46
parent2741a8fb38defaca15c4ef870087354a272f3711
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
tests/check/ges/save_and_load.c