Merge branch 'MDL-53139' of https://github.com/dg711/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:12:18 +0000 (00:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:12:18 +0000 (00:12 +0100)
commit987226c0904cb28b2e334274a964d897fbb59deb
tree5bd7013376dd2c2b9de3d41c269e18a20a596dc5
parent1e60d7e482530dce500d93a0ba9255c3319691a0
parent92cec53b47e908fa7b757879fc3eecb573ca7e83
Merge branch 'MDL-53139' of https://github.com/dg711/moodle