Merge branch 'MDL-51633_M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE
commitbc6a3998b97f988a41248dad1d3f24d294dec611
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:49:10 +0000 (10 17:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:49:10 +0000 (10 17:49 +0200)
tree80317484ec5c5580c629bbf2fe36d8fdb8e412dc
parent0fd4fe4fb3683bbaedf90f730ac17cd4f733d3ec
parent8a5e17b2e1f9b198889da17fcd306d41952271e6
Merge branch 'MDL-51633_M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE