Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 02:56:50 +0000 (10:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 02:56:50 +0000 (10:56 +0800)
commita88f8b2fd560dff9af4f152230dbd5cb72ec6d47
tree01b9d95c768ba7e96dc039f109b421a55f6288bd
parent60941d4cb0d967c1044a80712391f48725d8a68c
parentc07712db17e1131abdfe671fb660eeb48f82f2a4
Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle