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

Trivial merge