Merge branch '47969-28' of git://github.com/samhemelryk/moodle
commitddb5bc5fcdfe6618960c8c2944ce8fbecbd84ffb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Nov 2014 00:56:59 +0000 (4 01:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Nov 2014 00:56:59 +0000 (4 01:56 +0100)
tree0496671e3b2f135b517320f8c33d030d0b87c691
parent882f91592292cb316b59909af677ef93f32746d8
parent70739e6e30a3f8814967483e4b06227540dae4b9
Merge branch '47969-28' of git://github.com/samhemelryk/moodle