Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 03:24:43 +0000 (11:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Nov 2015 03:24:43 +0000 (11:24 +0800)
commitda737c7201c430f6e30b428ee69bc1462cc2e902
treee055c70050ac10d7d6730abda59cfe8ac00c751e
parentf8e685af440ddb3c75fc9916320de0a0aa010a83
parent90e815390af9e4813d26dd0599a837d1cd6d1988
Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle