Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 May 2015 04:28:59 +0000 (12:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 May 2015 04:28:59 +0000 (12:28 +0800)

Trivial merge