Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 06:05:17 +0000 (14:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 06:05:17 +0000 (14:05 +0800)

Trivial merge