Merge branch 'MDL-50245_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE
commit3c68e824d7aeb206a769c336f46a88600d29225a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:33:25 +0000 (19 00:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:33:25 +0000 (19 00:33 +0200)
tree94ab9eecd3818e84bcce686065df19634e733e07
parentf53c8c2a025a1e6f90e2fdfe6fff2cfdbd69010e
parente5636f9aa4479ba13e2f293eb6605862f7b7e0d7
Merge branch 'MDL-50245_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE