Merge branch 'MDL-43738_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 05:29:03 +0000 (13:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 05:29:03 +0000 (13:29 +0800)

Trivial merge