Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 11:17:13 +0000 (12:17 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 11:17:13 +0000 (12:17 +0100)
commitbe7c4e4cac89f41fa45075882d7042b7e73232c7
tree1eed65dd2ea2979a37d97becacfa2b8bc488a2de
parent2e04d927186076e1bedb5e91eb6318d6074c385c
parent37c47e32bcc455bbffe593fc1a94440233aa9071
Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle