Merge branch 'MDL-44905' of https://github.com/anieminen/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 30 May 2017 01:32:03 +0000 (09:32 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 30 May 2017 01:32:03 +0000 (09:32 +0800)
commita142f6dc59818f114c51192bedce1167537fdaea
tree0bd80ab5675ab6afa37fc30303c7f443afef495e
parent9e7afbbc6c484bec930546d474e482d790003a18
parent81d7b77d6f92fa6d8d08d839d79f3e16daae1c3c
Merge branch 'MDL-44905' of https://github.com/anieminen/moodle