Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 01:30:56 +0000 (09:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 01:30:56 +0000 (09:30 +0800)

Trivial merge