Merge branch 'MDL-58722-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE
commitd39fbc3e064f6e8e3ae14c0ddf46dc2ac165d070
authorDan Poltawski <dan@moodle.com>
Thu, 27 Apr 2017 13:36:25 +0000 (27 14:36 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 27 Apr 2017 13:36:25 +0000 (27 14:36 +0100)
treed359bc0cae9d774e5a468207b441bc17aa85fe1d
parent1d2368318ace4483874458d7bba74d152fa49fe6
parent7dfa47b2dd7202a8da9a9eb51f4adfa8ec50be0e
Merge branch 'MDL-58722-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE