From: Sam Hemelryk <sam.hemelryk@gmail.com>
Date: Tue, 2 Aug 2011 06:08:31 +0000 (+0800)
Subject: Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle
X-Git-Tag: v2.2.0-beta~619
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=5867cf50475886e250cc25cf00acc03b40671afa

Merge branch 'wip-MDL-27754-master' of git://github.com/marinaglancy/moodle
---

5867cf50475886e250cc25cf00acc03b40671afa