Merge branch 'MDL-43504-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 06:19:36 +0000 (14:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 06:19:36 +0000 (14:19 +0800)

Trivial merge