Merge branch 'MDL-49477-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Apr 2015 05:51:11 +0000 (13:51 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:17 +0000 (10:19 +0100)

Trivial merge