Merge branch 'MDL-49313-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 6 Apr 2015 01:54:55 +0000 (09:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 6 Apr 2015 01:54:55 +0000 (09:54 +0800)

Trivial merge