Merge branch '48304-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Nov 2014 23:23:42 +0000 (00:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Nov 2014 23:23:42 +0000 (00:23 +0100)
commitf62b278a9127e3dbd6d89993dcae7506e2132923
treea90459f217a6c944498aea3749567b19a56f5915
parent4cbf997db052a134d715d888ac22548ad2ebff46
parent99151092682ea5d7722450777d710c6da430dad9
Merge branch '48304-29' of git://github.com/samhemelryk/moodle