Merge branch 'MDL-52806' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Feb 2016 22:04:43 +0000 (23:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Feb 2016 22:04:43 +0000 (23:04 +0100)
commita4a44e2c274351680859e09d3df1ce63fd64508f
tree34cdf5642ee52b0e73ba0e0144b32f70f88f798c
parent153fbcd24a729f23062a3ca5bd919ef7bd9b10df
parenta10bd0d9a833e8a3fe5cba229e48319d7b3b2e65
Merge branch 'MDL-52806' of git://github.com/timhunt/moodle