Merge branch 'MDL-50102' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 May 2015 09:50:35 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 6 May 2015 09:50:35 +0000 (10:50 +0100)

Trivial merge