Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)

Trivial merge