Merge branch 'MDL-42842' of https://github.com/danielneis/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 05:41:55 +0000 (13:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 05:41:55 +0000 (13:41 +0800)

Trivial merge