Merge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:48:47 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:48:47 +0000 (00:48 +0100)
1  2 
lib/moodlelib.php

Simple merge