Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:46:23 +0000 (12:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 04:46:23 +0000 (12:46 +0800)

Trivial merge