Merge branch 'MDL-44408' of git://github.com/jleyva/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 23:44:21 +0000 (11:44 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 23:44:21 +0000 (11:44 +1200)

Trivial merge