Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 15:12:24 +0000 (15:12 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 15:12:24 +0000 (15:12 +0000)

Trivial merge