Merge branch 'MDL-59645-master-flickr' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 17:29:40 +0000 (19:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 17:29:40 +0000 (19:29 +0200)

Trivial merge