Merge branch 'wip-MDL-37250-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
commitcd172ea20ee2a42dd67cfe45809543a012f202b2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 10:19:37 +0000 (12 12:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 11:21:15 +0000 (12 13:21 +0200)
treea6aaa1812caee15f37824d93d2673b2d092b7a13
parenteee0dce093a8365f7a55496dacddb7f404b3d172
parentc77ade85876380ace3a74b4e545c8fc1cabd2b35
Merge branch 'wip-MDL-37250-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE