Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Fri, 23 Jun 2017 16:08:36 +0000 (00:08 +0800)
committerAMOS bot <amos@moodle.org>
Fri, 23 Jun 2017 16:08:36 +0000 (00:08 +0800)
commitb87f163a1b63690bddaedde80d18f83778a5420a
tree38e25335a208e811abd5d27530e07f0ca99f8b14
parent979202e96bed6fb4bfb67855d314b0429674dd06
parentf4a2d69631d40a28c423b2af675ce244c6ef40ea
Merge branch 'master' into install_master