Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 01:37:12 +0000 (13:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 01:37:12 +0000 (13:37 +1200)

Trivial merge