Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 27 May 2015 03:58:22 +0000 (11:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 May 2015 03:58:22 +0000 (11:58 +0800)

Trivial merge