Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 11:28:13 +0000 (11:28 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 11:28:13 +0000 (11:28 +0000)
commit5fd24a89a65c3d5c6711d8e29be537cbf814fa0a
tree1c2749027cb22d8d22b50170ebcfa30f3e2741ec
parent82a7a678691099118a5ed74f2b94fd5f01e49dd9
parent05aa787bde05b9b5eed0557667a42eba9c1dd6d4
Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle