From: Dan Poltawski <dan@moodle.com>
Date: Mon, 22 Dec 2014 15:38:49 +0000 (+0000)
Subject: Merge branch 'MDL-42166-master' of git://github.com/xow/moodle
X-Git-Tag: v2.9.0-beta~736
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=427f70a8d3d42bb76e3c665ccb5b10e899632cde;ds=sidebyside

Merge branch 'MDL-42166-master' of git://github.com/xow/moodle
---

427f70a8d3d42bb76e3c665ccb5b10e899632cde