Merge branch 'MDL-59154-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:44:57 +0000 (13:44 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:44:57 +0000 (13:44 +0800)
commit46f2ea5dba7f133f14336eec29b98f965b6027ee
tree9ba854c286a4ecbb8c65fec2fb3d66d7132b3e89
parent8363ec8637045d0cc2fe9b4d7f8ca9fe33b16ed0
parentd0f6660b98beb4acde2535dfdcadfb62343ade99
Merge branch 'MDL-59154-master' of git://github.com/andrewnicols/moodle