Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Mar 2012 15:25:49 +0000 (15:25 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 12 Mar 2012 15:25:49 +0000 (15:25 +0000)
commit5d02075d9baa31d3b9932ff1abfe21e3ae1de6c4
tree8f560e33757f2ae626058802d2943c534bc77724
parent1da4d714313b0673bfb26d4171038746266333e9
parente121368e37b8bbc4f1697221bf48ca7b7152fb29
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
bindings/python/Makefile.am
bindings/python/ges-types.defs
bindings/python/ges.defs
bindings/python/ges.override
bindings/python/gesmodule.c
bindings/python/testsuite/test_textoverlay.py
configure.ac
docs/libs/ges-sections.txt
ges/Makefile.am
ges/ges-timeline-pipeline.c
ges/ges-timeline.c
ges/ges-track.c
ges/ges.c
tests/check/ges/save_and_load.c
tests/examples/ges-ui.c
tools/ges-launch.c