Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 01:54:16 +0000 (14:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 01:54:16 +0000 (14:54 +1300)

Trivial merge