Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 24 Apr 2015 02:25:29 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:20 +0000 (10:19 +0100)

Trivial merge