Merge branch 'MDL-56069_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commit9416c59e4753f494df2c660cd0403716298db03b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 14:37:50 +0000 (4 16:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 14:37:50 +0000 (4 16:37 +0200)
treeefa27580b113823b8e0d00f7ad91d4c3cef03aff
parent4e2770b175d3ce07306f056446ca3ec4d18a0dca
parent14f75eda28912652c6bd43494464a4743b5aff65
Merge branch 'MDL-56069_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE