From: Dan Poltawski <dan@moodle.com>
Date: Fri, 18 Apr 2014 07:27:41 +0000 (+0800)
Subject: Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle
X-Git-Tag: v2.7.0-rc1~123
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c8ca0cea7712b6c2aaecaeafaeee8132b293608a;hp=-c

Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle
---

c8ca0cea7712b6c2aaecaeafaeee8132b293608a