Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 08:46:12 +0000 (16:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 08:46:12 +0000 (16:46 +0800)

Trivial merge