Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:24:08 +0000 (01:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:24:08 +0000 (01:24 +0200)

Trivial merge