Merge branch 'MDL-55874-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
commit1a3c879c0d752503715e88a705577ca8800889b4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 16:32:31 +0000 (12 18:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 16:32:31 +0000 (12 18:32 +0200)
tree29d30f05c111842449d31c44c7eecccbb10b30cf
parent2b4d17de5bcfb2e5a2171c46be483edc707e0a91
parent8857a38fcff6e2f5a4af69d2b7a5addfb4170ea1
Merge branch 'MDL-55874-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE