Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 21:02:32 +0000 (09:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 21:02:32 +0000 (09:02 +1200)

Trivial merge