Merge branch 'w34_MDL-34868_m24_gmapsv2' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 18:17:27 +0000 (20:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 18:17:27 +0000 (20:17 +0200)
commitfae6f7cad08130e70a014f65059eb41adbdd85ef
tree8aec7c2e565312c17b58ee25572569e1a034b9a1
parent040d4c63be4ae3dbcb3a3dfff0dfadbcfa0097e3
parentb32ec7a3b96149041789b4594183927daf0c1e1a
Merge branch 'w34_MDL-34868_m24_gmapsv2' of git://github.com/skodak/moodle
lang/en/admin.php