Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 13:56:22 +0000 (13:56 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 13:56:22 +0000 (13:56 +0000)
commitde8388f529552df03652fe3171293d2762b79960
tree8e6da42adb6de814c6efbc914dbd4236b969f2fb
parent867dc76f64af33e0186b3e33640aa89836700dc6
parent6d2f938cbd5e3740d30c2f77dc8fc11de0fea6f2
Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle