Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 04:12:23 +0000 (12:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 May 2013 04:12:23 +0000 (12:12 +0800)

Trivial merge