Merge branch 'MDL-55315-M31' of https://github.com/mrmark/moodle into MOODLE_31_STABLE
commit790b9eab79a2053693d5337aeb9669f13260cd91
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:08:39 +0000 (2 17:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:08:39 +0000 (2 17:08 +0200)
tree84ef2a5ffb93c84a461ab9881dd156c6c222e739
parent67d51a5eff2ca3937a4609462904c8201d952b5d
parent73c218f4c525c4c90326f0fbecba24562198e735
Merge branch 'MDL-55315-M31' of https://github.com/mrmark/moodle into MOODLE_31_STABLE