Merge branch 'wip-MDL-48325-28' of git://github.com/abgreeve/moodle into MOODLE_28_STABLE
commitc3e2b05d4065047b7fb72a9230c2bceb3ea4b2a4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 23:25:57 +0000 (27 00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 23:25:57 +0000 (27 00:25 +0100)
tree2d3f37c1fb2dc0e8425e916a4e6cf717787870fc
parent7458e60445876247e5306d186bbed385cca8b491
parenta6acd5ff4f00d5e9b5f5b40106153630fa691f4e
Merge branch 'wip-MDL-48325-28' of git://github.com/abgreeve/moodle into MOODLE_28_STABLE