Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Wed, 23 Nov 2016 16:06:13 +0000 (00:06 +0800)
committerAMOS bot <amos@moodle.org>
Wed, 23 Nov 2016 16:06:13 +0000 (00:06 +0800)
commitc61d7c0802a4d7e8c6f3ea60dee31c819dd90091
treefbbc4d24e6f156c56f566c96bfb3c13ba8705a99
parent499f4a78236cec4eb6a36bd47665d7a4924f46e6
parent0fbe41f4cda13cb2a205aaa4eaeeec45e595e3b6
Merge branch 'master' into install_master