Merge branch 'MDL-48720-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE
commit7458e60445876247e5306d186bbed385cca8b491
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 18:11:34 +0000 (26 19:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 18:11:34 +0000 (26 19:11 +0100)
treef1a19142bbc5c08020a0ccbb062f30b5e13bee94
parentbf986b9e45520949c3e44ee684be4fe9af79392b
parent9a0284c657dca388afa055da91ec857381870f30
Merge branch 'MDL-48720-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE