Merge branch 'MDL-37562-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 07:42:36 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 07:42:36 +0000 (15:42 +0800)

Trivial merge