Merge branch '47917-28' of git://github.com/samhemelryk/moodle
commit1ebcb0080b2847caa0b320e91b15ebfec393e0ae
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Nov 2014 23:03:42 +0000 (4 00:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Nov 2014 23:03:42 +0000 (4 00:03 +0100)
tree79c48ad2ad1f1b8dba575bd58057bb54bdb6942a
parentedc89dfecb3f6891cea019baf2aecce51b3de41a
parent1b5b97fac5817f627d72f96909e72ba1488807b5
Merge branch '47917-28' of git://github.com/samhemelryk/moodle