Merge branch 'master_MDL-33939' of https://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 05:23:28 +0000 (13:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 05:23:28 +0000 (13:23 +0800)

Trivial merge