Merge branch 'master_MDL-45623' of git://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:58:48 +0000 (09:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 21:58:48 +0000 (09:58 +1200)

Trivial merge