Merge branch 'MDL-25612_rss_block' of git://github.com/stronk7/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 19:37:28 +0000 (20:37 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 19:37:28 +0000 (20:37 +0100)

Trivial merge