Merge branch 'MDL-50589-master' of git://github.com/jleyva/moodle
commit02c72ecb79d5e3ef383c2315ace34163e9320f7f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:53:08 +0000 (11 16:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:53:08 +0000 (11 16:53 +0100)
tree80743e6f8b1e72e67efa4f572c9b06e7d390e6e0
parent169167c1861c30fc73a0ecb263bde8c74e5d520e
parenta7d13ecf2b925f7e452a90d8abb756fbfefdee4f
Merge branch 'MDL-50589-master' of git://github.com/jleyva/moodle