Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Jul 2013 14:28:21 +0000 (22:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Jul 2013 14:28:21 +0000 (22:28 +0800)

Trivial merge