Merge branch 'MDL-33663' of https://github.com/rushi963/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 11:44:24 +0000 (11:44 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 11:44:24 +0000 (11:44 +0000)

Trivial merge