Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 07:12:56 +0000 (15:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Nov 2013 07:12:56 +0000 (15:12 +0800)

Trivial merge