Merge branch 'MDL-47981-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:00:19 +0000 (12:00 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 12:00:19 +0000 (12:00 +0000)

Trivial merge