Merge branch 'MDL-37626-m' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 03:49:16 +0000 (11:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 03:49:16 +0000 (11:49 +0800)

Trivial merge