Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Apr 2015 10:39:18 +0000 (11:39 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:18 +0000 (10:19 +0100)

Trivial merge