Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 01:00:53 +0000 (02:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 01:00:53 +0000 (02:00 +0100)
commit689461f4d82db4d8229b06e682982174efd0a53d
tree03a05bd6ae52ebfbbc0cf230c488c27ea32ecd80
parentba54648b45b44f2f685d124dadddb714d35b523a
parentad6fbb60748cffc01728ce72935df1a55bf77145
Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle
lang/en/admin.php