Merge branch 'MDL-51172' of git://github.com/ramdesh/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 02:25:24 +0000 (10:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 02:25:24 +0000 (10:25 +0800)

Trivial merge