Merge branch 'MDL-56095-master-fixup' of https://github.com/FMCorz/moodle
commitef3e4d6cc4be2579c5beac41a12beb2221824473
authorDan Poltawski <dan@moodle.com>
Mon, 10 Oct 2016 12:13:08 +0000 (10 13:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Oct 2016 12:13:08 +0000 (10 13:13 +0100)
treea5862cd6a13ea05570b7037c566205eb3f3e93b3
parente99efa171c2633690e60fab75e2a0b031de2bf04
parentfc72f49da33c1397c13d6947d24f9a51907ef7ff
Merge branch 'MDL-56095-master-fixup' of https://github.com/FMCorz/moodle