Merge branch 'MDL-31036-master' of git://github.com/zbdd/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 Feb 2015 06:54:48 +0000 (14:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 Feb 2015 06:54:48 +0000 (14:54 +0800)

Trivial merge