[gcompris: 99/111] Merge branch 'master' of github.com:serah/GCompris

[Bruno Coudoin <bcoudoin src gnome org>]

commit e40d19cef909e54355d0618cf4f297bec85c1210
Merge: 772290e 8fa1366
Author: serah <serah4291 gmail com>
Date:   Thu Sep 13 16:01:23 2012 +0530

    Merge branch 'master' of github.com:serah/GCompris

 src/color_mix-activity/color_mix.xml.in            |   10 +++++-----
 .../color_mix_light.xml.in                         |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)
---