Merge branch 'MDL-43802_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 06:01:33 +0000 (14:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 06:01:33 +0000 (14:01 +0800)

Trivial merge