Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 01:16:26 +0000 (14:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 01:16:26 +0000 (14:16 +1300)

Trivial merge