Merge branch 'MDL-52542' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 11:05:40 +0000 (11:05 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 11:05:40 +0000 (11:05 +0000)
commit7fe67ef4ad403ca74cbe94d4950779e3c759058b
tree8b604fa1ea4a0d096d2924a3986a4e1ec333deef
parent2f3ebc9bdb17a04222a79a0136f5c8a06d9fd569
parent3ca956b6295665db6094b4bd7cc0be94fc350f02
Merge branch 'MDL-52542' of git://github.com/timhunt/moodle