Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)

Trivial merge