From: Marina Glancy <marina@moodle.com>
Date: Thu, 1 May 2014 03:22:54 +0000 (+0800)
Subject: Merge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle
X-Git-Tag: v2.7.0-rc1~25
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=d2d4a49091276fc48e92439220c68f31d7110bdf

Merge branch 'wip-MDL-45348-master' of git://github.com/abgreeve/moodle
---

d2d4a49091276fc48e92439220c68f31d7110bdf