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)
commit5083fe219487cb0a4eb8e21fb275692b3daf9b2e
tree98dadbf63d39b61388a79ba92d849479c5004bef
parent8057d3ee777f457b58e7e9c900ae9267280a0461
parent3d89a36a85e42ce8929afc69c0f032f0af6f8ddd
Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle