Merge branch 'master_MDL-43797' of https://github.com/totara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 23:43:16 +0000 (00:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 23:43:16 +0000 (00:43 +0100)
1  2 
lib/moodlelib.php

Simple merge