Merge branch 'MDL-46747' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 06:03:39 +0000 (14:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 06:03:39 +0000 (14:03 +0800)

Trivial merge