Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 01:11:25 +0000 (14:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 01:11:25 +0000 (14:11 +1300)

Trivial merge