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

[Bruno Coudoin <bcoudoin src gnome org>]

commit 940152218959f2d388f03f2fced9980e57284289
Merge: 500ee5b 8eceff9
Author: serah <serah4291 gmail com>
Date:   Wed Aug 22 00:54:28 2012 +0530

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

 src/intro_gravity-activity/init_path.sh            |    2 +-
 .../place_your_satellite.xml.in                    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---