Merge branch 'MDL-51524-master' of git://github.com/andrewnicols/moodle
commitb60abb8486224b74fe5bbb772ad4f6061af25431
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 02:36:05 +0000 (12 10:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 02:36:05 +0000 (12 10:36 +0800)
tree90aa6fdb8f544247068b8107618fbf743133f009
parentc0ea3a71fc5080e71d301971fbe3ab76910a0cb7
parent44250050dc2ce337262e05bb01b31dc19115122a
Merge branch 'MDL-51524-master' of git://github.com/andrewnicols/moodle