Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 04:21:20 +0000 (12:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 04:21:20 +0000 (12:21 +0800)

Trivial merge