Merge branch 'MDL-56019-30' of git://github.com/dpalou/moodle into MOODLE_30_STABLE
commit0de90550dc5065567f1095de6c1626bd69035cb6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 18:08:48 +0000 (28 20:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 18:08:48 +0000 (28 20:08 +0200)
tree04cd0dd17cfb6d4ac379503ed9387fe0980c9bf5
parentd1b6cf43332d0cb212083c44764dcbd70eb248b3
parentd6fd5d362f18096f5fb70b06a80fb8b4277743b0
Merge branch 'MDL-56019-30' of git://github.com/dpalou/moodle into MOODLE_30_STABLE