Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Apr 2014 21:26:07 +0000 (09:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Apr 2014 21:26:07 +0000 (09:26 +1200)

Trivial merge