Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 02:52:47 +0000 (14:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 02:52:47 +0000 (14:52 +1200)

Trivial merge