Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 22:24:52 +0000 (23:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 22:24:52 +0000 (23:24 +0100)
commit2623f6bef2023458da31469460acdc50f926bcfe
tree37f84e3982f6f34539809389c3da53b13113baa5
parent2453531f038e19faace0de69fb6dd08f571fe812
parentfa7f750c60db0a65ad69d6fd5caaccd0ce057cb8
Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle
lang/en/admin.php