Merge branch 'MDL-38904-m' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Apr 2013 03:57:38 +0000 (11:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Apr 2013 03:57:38 +0000 (11:57 +0800)

Trivial merge