Merge branch 'MDL-18162-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jun 2014 03:00:26 +0000 (15:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jun 2014 03:00:26 +0000 (15:00 +1200)

Trivial merge