Merge branch 'MDL-53547' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 21:58:30 +0000 (22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 21:58:30 +0000 (22:58 +0100)
commitdebb1c3a6cea89ce31be1d8a59ead3d1f4a102b8
tree4a9951af4f2910aca05c2ac5e908319c05505261
parent63dcc8763117eadf7de85c1cafc5b226186ba108
parent4c8c69ea9fad3a85bdc472ac3c128e5fc0f443d2
Merge branch 'MDL-53547' of git://github.com/timhunt/moodle