Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 05:43:54 +0000 (13:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 05:43:54 +0000 (13:43 +0800)

Trivial merge