Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:17:29 +0000 (08:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:17:29 +0000 (08:17 +0800)

Trivial merge