Merge branch 'wip-MDL-25249-master-r1' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:55:20 +0000 (00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:55:20 +0000 (00:55 +0200)
1  2 
lib/moodlelib.php

Simple merge