Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 08:19:25 +0000 (16:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 08:19:25 +0000 (16:19 +0800)

Trivial merge