Merge branch 'MDL-41663-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 08:24:39 +0000 (09:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 08:24:39 +0000 (09:24 +0100)

Trivial merge