Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 06:11:30 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 06:11:30 +0000 (14:11 +0800)

Trivial merge