Merge branch 'MDL-54663-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE
commit80c47141a12ed99f423a28be542ee192c4f5f1b4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 11:26:51 +0000 (27 13:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 11:26:51 +0000 (27 13:26 +0200)
treee784834991328905486fc042b4514c66c92476d7
parent9880e5fbd7229a854bce85f9c3776a83913f333c
parent79c37128c3fda3c25a9fb782194b277e69a1450a
Merge branch 'MDL-54663-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE