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

Trivial merge