Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 04:34:31 +0000 (12:34 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 04:34:31 +0000 (12:34 +0800)

Trivial merge