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)
1  2 
lang/en/admin.php

Simple merge