From: Dan Poltawski <dan@moodle.com>
Date: Mon, 4 Nov 2013 15:40:33 +0000 (+0800)
Subject: Merge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle
X-Git-Tag: v2.6.0-rc1~148
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=24a922e95301027ac02485fafbf13037f7a3aa22

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

24a922e95301027ac02485fafbf13037f7a3aa22