Merge branch 'MDL-45061' of git://github.com/jleyva/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 16 Apr 2014 20:37:26 +0000 (08:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 16 Apr 2014 20:37:26 +0000 (08:37 +1200)

Trivial merge