Merge branch 'MDL-49335' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 14:46:34 +0000 (14:46 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 14:46:34 +0000 (14:46 +0000)

Trivial merge