Merge branch 'MDL-32746-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 06:49:42 +0000 (14:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 06:49:42 +0000 (14:49 +0800)

Trivial merge