Merge branch 'MDL-53634-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 00:28:32 +0000 (02:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 00:28:32 +0000 (02:28 +0200)
commite6166d9bf7fa28feec5e099a43b6ec2e71760acd
treeb15283741d77adb252ef28ee5f1e489b5ddeafd8
parentba982fef66a9fd7d1f57b767b74b6d497cef22fe
parentc42c23557e00f47141ce09d1e0661df500df19b6
Merge branch 'MDL-53634-master' of git://github.com/andrewnicols/moodle