Merge branch 'MDL-33315_blog_rss' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 08:49:28 +0000 (16:49 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 08:49:28 +0000 (16:49 +0800)

Trivial merge