Merge branch 'MDL-46509' of https://github.com/danielneis/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Aug 2014 03:45:43 +0000 (11:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Aug 2014 03:45:43 +0000 (11:45 +0800)

Trivial merge