Merge branch 'MDL-45041' of git://github.com/jleyva/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Jul 2014 03:47:13 +0000 (15:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Jul 2014 03:47:13 +0000 (15:47 +1200)

Trivial merge