Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 06:04:47 +0000 (14:04 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 10 Oct 2013 06:04:47 +0000 (14:04 +0800)

Trivial merge