Merge branch 'MDL-51633_M31' of git://github.com/lazydaisy/moodle into MOODLE_31_STABLE
commit1a6ba31a953b1d9fb80733ec1144711a4f6d3462
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:37:57 +0000 (10 17:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:37:57 +0000 (10 17:37 +0200)
tree93801c05a5f7c00364d4d1daae4bad1a6bc04666
parent52306fe0192f965ecf5b579f62f8f62af61304d3
parent5a36fc8bd2eec47e09d9772c3e017aaf39b75dac
Merge branch 'MDL-51633_M31' of git://github.com/lazydaisy/moodle into MOODLE_31_STABLE