Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 23 Apr 2015 07:53:31 +0000 (15:53 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:18 +0000 (10:19 +0100)

Trivial merge