Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 12 Apr 2017 02:06:13 +0000 (10:06 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 12 Apr 2017 02:06:13 +0000 (10:06 +0800)
commit8168bfd3e415f1b0f0b84e12273ac0d1814478eb
treee8ac02e1f81ea573ec1bdebf11c2e9addea4a179
parentad02561c15e9de6eded441b102ad154e2028cfb1
parent0c0f3fdc1e26ee8fb8eb0a1cc6e3b6df51e249a8
Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle