Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 10:05:05 +0000 (12:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 10:05:05 +0000 (12:05 +0200)
commita598a8d4b1746d7d01f825958c2819258a5cd52d
tree0112c27f1d82487ff0d1eafeb995fadaacf00c89
parent22ca3e49e00de03f38cc38ce7c147e57039f56c7
parent7fb46992661e2eb1fb7bfd1a6d3f7f1ccf8fd306
Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle
lang/en/admin.php