Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)

Trivial merge