Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Sep 2014 23:37:22 +0000 (01:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Sep 2014 23:37:22 +0000 (01:37 +0200)

Trivial merge