Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)

Trivial merge