Merge branch 'MDL-52513' of https://github.com/rushi963/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Mar 2016 05:23:56 +0000 (13:23 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Mar 2016 05:23:56 +0000 (13:23 +0800)

Trivial merge