Merge branch 'MDL-46852-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 08:16:08 +0000 (16:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 08:16:08 +0000 (16:16 +0800)

Trivial merge