Merge branch 'wip-MDL-29093-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Sep 2011 22:28:56 +0000 (00:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Sep 2011 22:28:56 +0000 (00:28 +0200)
commitcdcb1b9ea16c504c93eb2f0601a2dc26f2a645b6
tree4e7dc9b3d0e138e870f5a2d6bb8cd2fec2b3d540
parent148c65bfc8c410c6c368bd8ac6ec6a64db8da7b0
parent2c7a91475f157c0d6f6bde0691217dbc140c4d88
Merge branch 'wip-MDL-29093-master' of git://github.com/samhemelryk/moodle
lang/en/admin.php
lib/moodlelib.php