Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 14:14:15 +0000 (15:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 14:14:15 +0000 (15:14 +0100)
commitee9b9ffd5118fce4a777c1157ccf72c729bf5fb2
tree962ed4e274bf9bd50b80773c082b9903a7f837c9
parenteee9e47d2815d38437bc0a91593bea614de47b8a
parent66cf47a045777ff39d17377d202aeace9a2627fe
Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle