Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 17:35:56 +0000 (19:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 17:35:56 +0000 (19:35 +0200)
commit17695e4b4d5c0365e1dcb752becafbe0f763ba22
tree511174a8938195f6b45b44bc2172a4c747bdf633
parent46da6e14ec28115e9fe6a604bcfeee4a55663c29
parentb5233f9bc9b045cebb4085abba21dec92d9253d9
Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle