Merge branch 'MDL-47014' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 11:19:24 +0000 (12:19 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 11:19:24 +0000 (12:19 +0100)

Trivial merge