Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Mar 2017 04:18:20 +0000 (12:18 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:04:49 +0000 (18:04 +0000)
commitaabe41f35997ffa053659b1cf7dc323d1c2cd5da
treedec4a4bb3be38d17cde8e1707190206c0cc08bcc
parentac40d8b589820929fe4201a3f0640414e2b9dabd
parent5f399bcf5567299b92648a6bc53b64eb60a8dfc1
Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle