Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:08:06 +0000 (12:08 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 10:08:06 +0000 (12:08 +0200)
commit8429fd526c05332f92a69dfa7655cc9557694903
tree05b99d5336ec06fef0ae8427123d93cd51e1ad86
parent1728704d09636d5b2bdce4863e50aca9fb9135f8
parent7282ee2ff4e28b4239da23e3c3dc808cbb4d91a2
Merge remote-tracking branch 'origin/0.10'

Conflicts:
bindings/python/Makefile.am
ges/Makefile.am
configure.ac
ges/Makefile.am
ges/ges-formatter.c