Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 16:24:37 +0000 (17:24 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 16:24:37 +0000 (17:24 +0100)
commita32f1bd4dc5bcaa4b59c9c9b4fc51b4e39b2077c
treee4a7455bbf9bf8a3a52a638be13dde5b1075ab43
parent0fe25be4cbc8ffab101f1ed585115fa763b927d3
parent737acd803ec71a5d6082947025f0b67d795ab27a
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
bindings/python/Makefile.am
bindings/python/ges.override
bindings/python/gesmodule.c
configure.ac
ges/ges-timeline-pipeline.c
ges/ges-timeline-pipeline.h