Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)

Trivial merge