Merge branch 'master_MDL-36800' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 03:35:54 +0000 (11:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Feb 2013 03:35:54 +0000 (11:35 +0800)

Trivial merge