Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 08:17:53 +0000 (09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 08:17:53 +0000 (09:17 +0100)
commitfa57043eb695d8c52755cf96c7b0034fb130398b
treeea8925e6d6f10b9467bf941ec7f5420bbf24da07
parent36a19ecc26d9299af09e7bec9e8dfa99729e1973
parent9a60d5f98f19dc5f0018c74a8ff533c89bf8dcda
Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle