From: Dan Poltawski <dan@moodle.com>
Date: Wed, 11 May 2016 09:00:50 +0000 (+0100)
Subject: Merge branch 'MDL-53293-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v3.1.0-rc1~51
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=15ab98e4e21a7cd20bea4b6f8155147f85a3bc25

Merge branch 'MDL-53293-master' of git://github.com/andrewnicols/moodle
---

15ab98e4e21a7cd20bea4b6f8155147f85a3bc25