Merge branch 'MDL-50677-master' of git://github.com/FMCorz/moodle
commit315918f187faf931a0a337d76991dd33919bb708
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:31:26 +0000 (31 20:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:31:26 +0000 (31 20:31 +0200)
tree2f2da074f600361d33db530f0859e63ff0cc61ab
parentd0efe9a080ab5930312ae6bd7a0666ccb4b32225
parent2b7848050d4e74ab101a09eaaa5f0b668c9cc5f8
Merge branch 'MDL-50677-master' of git://github.com/FMCorz/moodle