Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODL...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 18:30:27 +0000 (20:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 18:30:27 +0000 (20:30 +0200)
commit3dd2dce1cb7019516e3aa5f16f1d750ecdaee513
treeaacb370d52bdd9d0d467789dc00a5d92efca25e7
parent1c5f24e089eb937db47b207039ba0437cea959f6
parent7e84ef4fea0620ecc3472ce174ad59f0e1d19c96
Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODLE_23_STABLE
lang/en/admin.php