Merge branch 'MDL-39377' of git://github.com/colchambers/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Apr 2013 21:48:18 +0000 (09:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Apr 2013 21:48:18 +0000 (09:48 +1200)

Trivial merge