Merge branch 'wip-MDL-31248-master-v2' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Mar 2012 01:27:55 +0000 (02:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Mar 2012 01:27:55 +0000 (02:27 +0100)
1  2 
lib/moodlelib.php

Simple merge