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)
commitd3e70202fc6779f8be211aa8607962e7142ce0e1
treee3a576b203f06d9769a48fed8fd73201e8d590f2
parentaec2b1c2dadad8598ab73950ccd52f94f0e2f1ee
parentb45444f591b0a24bd452bc0c5ddd65e0614cbb34
Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle