Merge branch 'MDL-46662-master' of git://github.com/zbdd/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 4 Feb 2015 02:36:42 +0000 (10:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 4 Feb 2015 02:36:42 +0000 (10:36 +0800)

Trivial merge