Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Mon, 2 Jul 2012 00:54:42 +0000 (20:54 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Mon, 2 Jul 2012 00:54:42 +0000 (20:54 -0400)
commit7eed7ef46cabe46da2a629f0e8d329dca52d80e2
treec3494a30e5e6b6e4e68e1b4fe60b03bb817573cd
parent5e824ef5aff500dab6caa315c7ec6b3986efdff8
parentaa923e60e6b912996848cdce77e60fd4963c60ff
Merge remote-tracking branch 'origin/0.10'

Conflicts:
common
docs/libs/ges-sections.txt
ges/ges-formatter.c