Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 07:15:25 +0000 (15:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 07:15:25 +0000 (15:15 +0800)

Trivial merge