Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle
commit6422f03f15917d04749f450465488d93e1caa39d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:21:31 +0000 (8 18:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:21:31 +0000 (8 18:21 +0200)
tree15fa2f17222b35ae1c0073304fe676c4ad70dc30
parent4a85f8dc16788bc0982fb01e630327ef06aab8e4
parentceac202f6417b769a035e0bfcc40852edcb6dee0
Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle