From: Dan Poltawski <dan@moodle.com>
Date: Tue, 2 Jul 2013 06:27:49 +0000 (+0800)
Subject: Merge branch 'MDL-40039-master' of git://github.com/ankitagarwal/moodle
X-Git-Tag: v2.6.0-beta~1103
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=6e4de306369b17344536c22fa86d25e1a2e7bcc2

Merge branch 'MDL-40039-master' of git://github.com/ankitagarwal/moodle
---

6e4de306369b17344536c22fa86d25e1a2e7bcc2