From: Dan Poltawski <dan@moodle.com>
Date: Tue, 31 Jul 2012 01:11:48 +0000 (+0800)
Subject: Merge branch 'MDL-34483' of git://github.com/timhunt/moodle
X-Git-Tag: v2.4.0-beta~901
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=93e1ff245d708e10c1e760830ba02fe3ecd479be;hp=--cc

Merge branch 'MDL-34483' of git://github.com/timhunt/moodle
---

93e1ff245d708e10c1e760830ba02fe3ecd479be