From: Dan Poltawski <dan@moodle.com>
Date: Wed, 20 Feb 2013 06:27:27 +0000 (+0800)
Subject: Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
X-Git-Tag: v2.5.0-beta~469
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=aa247695e78c6cd574fdd720ab0aebffc169e2d9

Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
---

aa247695e78c6cd574fdd720ab0aebffc169e2d9