Merge branch 'MDL-52567_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jan 2016 23:22:00 +0000 (00:22 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:23 +0000 (10:15 +0800)
1  2 
lib/moodlelib.php

Simple merge