Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 08:41:20 +0000 (09:41 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:21 +0000 (10:19 +0100)

Trivial merge