Merge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 01:21:54 +0000 (13:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 01:21:54 +0000 (13:21 +1200)

Trivial merge