Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Dec 2013 01:04:09 +0000 (14:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Dec 2013 01:04:09 +0000 (14:04 +1300)

Trivial merge