Merge branch 'MDL-41755-master-v2' of git://github.com/jamiepratt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 07:01:45 +0000 (15:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 07:01:45 +0000 (15:01 +0800)

Trivial merge