Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 09:54:23 +0000 (11:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 09:54:23 +0000 (11:54 +0200)
commit537054ec274a7e1863e79dc55715845f358b6aff
treefa1fe34c77c9f61833eb76bec2f04ca3b8729ae9
parentb65c33ace579887a3fae3d03cb3de2d38a546239
parent8beee5a4499b191559077fada628609e6504c392
Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle