Merge branch 'MDL-54610_master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 01:23:48 +0000 (09:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:58 +0000 (09:24 +0100)
commit48d1322527a8da261ddf42a5fd9563fb0e582dd0
treedcb25524887b2fb7ee5e818e77fe608a3f426018
parent47d986828e4c83c97c4fb6bbddd2f3b8957aa828
parentf56cbd3bbf718f59817e4502bc0fcb5e8073ffa6
Merge branch 'MDL-54610_master' of https://github.com/snake/moodle