Merge branch 'MDL-47266_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE
commit2893aa4904c43df99a8e7c04cbb305b6e8061d38
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:12:22 +0000 (23 01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:12:22 +0000 (23 01:12 +0200)
tree204e61ed4d390ed7db494dd06584979e9fc0f6a4
parenta733c2ce43654386d213154a38f564500e090c7f
parent3024caa17312f3845830ee191d03619ddc0eb248
Merge branch 'MDL-47266_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE