Merge branch 'MDL-38052_master' of git://github.com/kordan/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 03:38:13 +0000 (11:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 03:38:13 +0000 (11:38 +0800)

Trivial merge