Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODL...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 18:18:03 +0000 (20:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 18:18:03 +0000 (20:18 +0200)
commit1c5f24e089eb937db47b207039ba0437cea959f6
tree976ce06263f219814b51114847e85bf55a74015d
parent331d346e8f0bed92f2fb67baa6940538ddaacc1d
parent778947cd6560ba15306635d7dc86bf6acb06537e
Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODLE_23_STABLE
lang/en/admin.php