Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 08:15:53 +0000 (16:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 08:15:53 +0000 (16:15 +0800)

Trivial merge