Merge branch 'wip-MDL-23534-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2011 19:59:38 +0000 (21:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2011 19:59:38 +0000 (21:59 +0200)
commit452b166526ccdc8472a605bb655fb144128a7df9
tree2cbef1f536a2776fed0fb1b9034a607e061cefb9
parentce9d0673d0ea709f3fc1ea7eb4425777c8d1fb32
parent016ba63816d7321c44acb46620d1fafa34063c21
Merge branch 'wip-MDL-23534-master' of git://github.com/samhemelryk/moodle
lang/en/admin.php