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

Trivial merge