Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 09:25:32 +0000 (10:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 09:25:32 +0000 (10:25 +0100)
commit4d9845426ed3c874d218f6d694b9a5c7447f250b
treec1f5989eeb3d06c3309c05d08353a16f0e725654
parent1e5b562ac98ca1af07472583ca26c83351176ab7
parentad606e65140624109444cf94038fe5b1c860682b
Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle