Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 08:08:50 +0000 (16:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 08:08:50 +0000 (16:08 +0800)

Trivial merge