Merge branch 'MDL-50890_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 01:10:28 +0000 (09:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 01:10:28 +0000 (09:10 +0800)

Trivial merge