Merge branch 'MDL-34586-master' of https://github.com/mackensen/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:29:52 +0000 (14:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:29:52 +0000 (14:29 +0800)

Trivial merge