Merge branch 'MDL-49763-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 14:53:17 +0000 (15:53 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 14:53:17 +0000 (15:53 +0100)

Trivial merge