Merge branch 'MDL-58932' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 07:57:09 +0000 (08:57 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 07:57:09 +0000 (08:57 +0100)
commitbbc9e4f5405ac848136d81e15ae3b39e1dc60f0c
treeb009068e550685f7b2e9a630409a7ee73a46eed4
parent86ef13916d4fc7bebb945d1f2a8b55a529482499
parent1820d0bb6dc2ea89cd40fe5f2e1eb881fca50920
Merge branch 'MDL-58932' of git://github.com/stronk7/moodle