Merge branch 'MDL-44108_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:42:32 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:42:32 +0000 (15:42 +0800)

Trivial merge