Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Jul 2016 23:05:12 +0000 (01:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Jul 2016 23:05:12 +0000 (01:05 +0200)
commit1de0b34bed52de82d622b1f3b2a5c8f069e48162
tree4fdd892fbd0fef6fb4e8579a1b0336e2657dd1ec
parentac8d6cff54fd881b7c0a8b51dc8b5c70736ccf10
parent1b0b082a08c25a8991884b7f5346b604cd92292f
Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle