Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 02:35:06 +0000 (10:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 02:35:06 +0000 (10:35 +0800)

Trivial merge