Merge branch 'MDL-40709-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:10:49 +0000 (16:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 08:10:49 +0000 (16:10 +0800)

Trivial merge