Merged MDL-25565 PULL-451 and fixed conflicts
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Mar 2011 03:16:50 +0000 (11:16 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Mar 2011 03:16:50 +0000 (11:16 +0800)

No differences found