Merge branch 'wip-MDL-48847-m28' of git://github.com/marinaglancy/moodle into MOODLE_...
commitaf04908d0d6daedd1013c72541883d0d1cce5b1a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 23:28:38 +0000 (21 00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 23:28:38 +0000 (21 00:28 +0100)
treeecfd8ae4e239831d2e2f95559eea01ee383c61e1
parent4c8fae005e2d4c69e2805855682d7054842f0d5b
parenta9bac80cace3bd95da7419a1769172c85154d748
Merge branch 'wip-MDL-48847-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE