Merge branch 'MDL-42187_master' of git://github.com/kordan/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:50:53 +0000 (14:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 14 Oct 2013 06:50:53 +0000 (14:50 +0800)

Trivial merge