Merge branch 'MDL-49800-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Apr 2015 09:47:56 +0000 (10:47 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Apr 2015 09:47:56 +0000 (10:47 +0100)

Trivial merge