Merge branch 'MDL-58994-33' of git://github.com/cameron1729/moodle into MOODLE_33_STABLE
commit98a7bb9cd534d14a6ff60a1c1ac9a7ce09d4885c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 May 2017 10:50:51 +0000 (30 12:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 May 2017 10:50:51 +0000 (30 12:50 +0200)
treeb07eb66108b7bacecc7a4c3bba990fd5972139fc
parentf35ff40f4a2a94bcf22adce7e3c91d8ba7937dfa
parenta4eaa35e23178e444cd83288479aad67e8f80efd
Merge branch 'MDL-58994-33' of git://github.com/cameron1729/moodle into MOODLE_33_STABLE