Merge branch 'MDL-50197_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE
commitda8ee816a79ed0cd96cbe7438f7be4eace66d203
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:35:47 +0000 (19 00:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:35:47 +0000 (19 00:35 +0200)
tree5ac33ca815213cf9c51dc7f79b6d8b3374360709
parent3c68e824d7aeb206a769c336f46a88600d29225a
parentbcda2f3745f4915810a7705ceadcc77ef9c59976
Merge branch 'MDL-50197_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE