From: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 1 Dec 2011 03:54:25 +0000 (+0800)
Subject: Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle
X-Git-Tag: v2.2.0-rc1~6
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=9be14d29e43513b0a5afd72d634776f4dcd9532b

Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle
---

9be14d29e43513b0a5afd72d634776f4dcd9532b