Merge branch 'MDL-51467-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Oct 2015 12:40:19 +0000 (13:40 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Oct 2015 12:40:19 +0000 (13:40 +0100)
1  2 
lib/moodlelib.php

Simple merge