Merge branch 'MDL-55618-m30' of https://github.com/NeillM/moodle into MOODLE_30_STABLE
commit5b33ea8f5981b18459f647a230e918e7761f1211
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:20:51 +0000 (6 16:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:20:51 +0000 (6 16:20 +0200)
treed295fdb33c0167211b6f5b558ed9cc47b0547762
parentf38037357a7b37669a6d1061d49d4fff904eaaa6
parentcb9594a285485865804df40e82e32e183ad9c67d
Merge branch 'MDL-55618-m30' of https://github.com/NeillM/moodle into MOODLE_30_STABLE