Merge branch 'MDL-43151-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 09:20:55 +0000 (10:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 09:20:55 +0000 (10:20 +0100)

Trivial merge