Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:21:14 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:21:14 +0000 (01:21 +0200)
commit6bf8e9b021b4fd0482fc85db6723e6348d241e68
treef22964247db0a66c7b070155352636ac00ed58f8
parent209d36cc78b7f16b18556ca3a1bebfc824bb4690
parente4edbce35d7f735df4cc2b059536999a35bc079f
Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle