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)
commitbc269f6782452f2726a14e23ae363457d2783872
tree402b2d65199549c2d2071f41c4f8efc4c91ebdbd
parent89bb268e213689b650cad78fabf79ce9a07cb925
parent5200054dc2777fcf72022744867dd27007c6b79d
Merge branch 'MDL-52567_master' of https://github.com/nadavkav/moodle
lib/moodlelib.php