Merge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 26 Aug 2013 04:42:15 +0000 (12:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 26 Aug 2013 04:42:15 +0000 (12:42 +0800)

Trivial merge