Merge branch 'MDL-45131-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 16 Apr 2015 09:04:34 +0000 (17:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 16 Apr 2015 09:04:34 +0000 (17:04 +0800)

Trivial merge