Merge branch 'MDL-39355-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 23:07:26 +0000 (11:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 23:07:26 +0000 (11:07 +1200)

Trivial merge