Merge branch 'MDL-45284_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 02:09:18 +0000 (14:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Apr 2014 02:09:18 +0000 (14:09 +1200)

Trivial merge