Merge branch 'MDL-49351-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 07:21:13 +0000 (15:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 07:21:13 +0000 (15:21 +0800)

Trivial merge