Merge branch 'master_MDL-45212' of git://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jun 2014 22:18:58 +0000 (10:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jun 2014 22:18:58 +0000 (10:18 +1200)

Trivial merge