Merge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:27:41 +0000 (15:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:27:41 +0000 (15:27 +0800)

Trivial merge