Merge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 05:47:39 +0000 (13:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 05:47:39 +0000 (13:47 +0800)

Trivial merge