Merge branch 'MDL-50197' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:35:35 +0000 (00:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:35:35 +0000 (00:35 +0200)
commitbb6b1071111619da005ab483205aadecf3036717
tree257d858badfc56dd454146e330665b17a0f3cc8b
parent767da25767ba75ba733073a41f2f1dbd93ca0ed3
parentca79762ac4e810f01632a20d5b5252fc22ef905b
Merge branch 'MDL-50197' of git://github.com/timhunt/moodle