Merge branch 'wip-MDL-32265-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 21:59:07 +0000 (23:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2012 21:59:07 +0000 (23:59 +0200)
1  2 
lib/moodlelib.php

Simple merge