Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2016 14:50:51 +0000 (16:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2016 14:50:51 +0000 (16:50 +0200)
commitcf7dc57a91d423e5896eb52084241b483d27a990
tree1951af32d8f181e0aa7d94036d2fe5507b4e736f
parent64ec975e19e3792d3802a2d060895e45cef801b2
parentad3f8cd18c3c50d73d04e0641b0b8e54386d04c2
Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle