Merge branch 'MDL-49993_master' of git://github.com/grabs/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Apr 2015 13:47:58 +0000 (14:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Apr 2015 13:47:58 +0000 (14:47 +0100)

Trivial merge