Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Oct 2016 20:25:46 +0000 (22:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Oct 2016 20:25:46 +0000 (22:25 +0200)
commitbadaed322417a117ba94de46f448ac343b1e777e
tree0c145ea670b3dd01a2537eb1f78b77bdefedecf1
parent41a9a9219ac55d42649f5b78ac85912f5de10b6b
parent636ec5010f27e30c3a99698414c933b8cc9f1281
Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle