Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 08:00:00 +0000 (16:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 08:00:00 +0000 (16:00 +0800)

Trivial merge