Merge branch 'MDL-50561-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 08:02:57 +0000 (16:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 08:02:57 +0000 (16:02 +0800)

Trivial merge