Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 09:32:14 +0000 (10:32 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 09:32:14 +0000 (10:32 +0100)

Trivial merge