Merge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Apr 2016 11:08:42 +0000 (13:08 +0200)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:18:03 +0000 (12:18 +0100)
commiteb98b1395db97cd33a0d2d8d2485fbf48f75148e
treebe4726268e400d125fb7eeff470052674de4905b
parentfaeca20d434fecb60c9237302eb92132b880254e
parentbc73c640717a202fda233ec9ab6c39d968d35ef4
Merge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle