Merge branch 'MDL-25864' of https://github.com/rushi963/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Jan 2016 10:54:50 +0000 (10:54 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:22 +0000 (10:15 +0800)

Trivial merge