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

Trivial merge