Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle
commit224853595c255d880bf424bdf994bb007dbc141f
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Mar 2017 04:10:56 +0000 (14 12:10 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 10:27:22 +0000 (14 11:27 +0100)
treeb79b195f25e85c0c2422a7b63353554e04c09e37
parent0c6435838a88b456dfaed2ab179e5821ce239ad0
parent1abfa3a95e4204531c09f2c1a652738e2a09571a
Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle