Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:56:57 +0000 (13:56 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:56:57 +0000 (13:56 +0800)

Trivial merge