Merge branch 'MDL-38759-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Jul 2013 20:58:14 +0000 (08:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Jul 2013 20:58:14 +0000 (08:58 +1200)

Trivial merge