Merge branch 'wip-MDL-47079-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commitdfc54de168d5fadee932fde955347afc004fe1e4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 16:39:20 +0000 (16 18:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 16:39:20 +0000 (16 18:39 +0200)
treeaf7e807856c3f48daf20e6ea9cbafb28917e7c8d
parent352e654ec7b389b090072f1361d627b2f774abf2
parent05a90fcdddd2ae0d3162a70f9352f30f01e6c716
Merge branch 'wip-MDL-47079-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE