Merge branch 'MDL-49334' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 13:25:33 +0000 (13:25 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 13:25:33 +0000 (13:25 +0000)

Trivial merge