Merge branch 'MDL-6397_database_rss_label' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Aug 2011 23:11:10 +0000 (11:11 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Aug 2011 23:11:10 +0000 (11:11 +1200)

Trivial merge