Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:28:00 +0000 (12:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:28:00 +0000 (12:28 +0800)

Trivial merge