Merge branch 'MDL-45169-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 Apr 2014 23:33:34 +0000 (11:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 Apr 2014 23:33:34 +0000 (11:33 +1200)

Trivial merge