Merge branch 'MDL-25720' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Dec 2010 15:36:17 +0000 (16:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Dec 2010 15:36:17 +0000 (16:36 +0100)
1  2 
lib/moodlelib.php

Simple merge