Merge branch 'wip-mdl-49113' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 02:35:00 +0000 (10:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 02:35:00 +0000 (10:35 +0800)

Trivial merge