Merge branch 'MDL-58574-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 18 Apr 2017 06:43:57 +0000 (14:43 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 18 Apr 2017 06:43:57 +0000 (14:43 +0800)
commit762550d7d2e3b19af7a368261a3eb9ae9f3f722d
treed41e2697d6fbbc17693b8557153fedae4e632cc2
parenta1b98c934c7f33475bedafc42967223c49ea5e7a
parent666b7b56443748d498d886c97e40503e75fbb412
Merge branch 'MDL-58574-master' of git://github.com/lameze/moodle