Merge branch 'MDL-47209-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 05:50:43 +0000 (13:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 05:50:43 +0000 (13:50 +0800)

Trivial merge