Merge branch 'MDL-25138-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 13 May 2015 02:23:01 +0000 (10:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 13 May 2015 02:23:01 +0000 (10:23 +0800)

Trivial merge