Merge branch 'MDL-48002-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:21:06 +0000 (10:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:21:06 +0000 (10:21 +0800)

Trivial merge