Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 03:15:03 +0000 (11:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 03:15:03 +0000 (11:15 +0800)

Trivial merge