Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 06:56:49 +0000 (14:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Sep 2013 06:56:49 +0000 (14:56 +0800)

Trivial merge