Merge branch 'MDL-37750_master-fix' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:47:50 +0000 (14:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:47:50 +0000 (14:47 +0800)

Trivial merge