Merge branch 'MDL-55618-m31' of https://github.com/NeillM/moodle into MOODLE_31_STABLE
commit2a681ccd06d9f5c7a29954836455645630f0c70f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:20:41 +0000 (6 16:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:20:41 +0000 (6 16:20 +0200)
treeee224835ebc6d54173738f08461dc2a16854ba06
parent2a098c992abe7ac51e8fa659c62b5435ac0edb9a
parent68cbd916a605a0568c77b4eebb5cad8760dbf2df
Merge branch 'MDL-55618-m31' of https://github.com/NeillM/moodle into MOODLE_31_STABLE