From: Dan Poltawski <dan@moodle.com>
Date: Tue, 31 Jul 2012 02:42:55 +0000 (+0800)
Subject: Merge branch 'MDL-34532' of git://github.com/timhunt/moodle
X-Git-Tag: v2.4.0-beta~896
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=8ba2123739c48d2754fe36c1f208da34d54a5bf3

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

8ba2123739c48d2754fe36c1f208da34d54a5bf3