Merge branch 'master_MDL-51015' of git://github.com/danmarsden/moodle
commit99c582a19f4500b4688411b8c154c658fc547cc0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 12:09:42 +0000 (11 14:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 12:09:42 +0000 (11 14:09 +0200)
treea639c64399a99c512ef360cd63d93261036910f7
parentb84129b11e285bcfe58799ade572ed41f60ed774
parent524aaa177a5319bbe945f93121b8e1b9fb28b4c6
Merge branch 'master_MDL-51015' of git://github.com/danmarsden/moodle