Merge branch 'MDL-45104-master-fix' of github.com:xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Feb 2016 02:14:06 +0000 (10:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Feb 2016 02:14:06 +0000 (10:14 +0800)
commit84fbbd9985e91cdbe21762b842d143ea32c95416
treeec604d4f51d7a8e6d30d8071e5194468fef4cff0
parent7204460d5afa714d3c4a665300cda7869170b4ed
parenta285d561ef6ef4aa521afa22d1fd4a5a0f9f85b9
Merge branch 'MDL-45104-master-fix' of github.com:xow/moodle