Merge branch 'MDL-58220-master-fix4' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 03:54:58 +0000 (11:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 03:54:58 +0000 (11:54 +0800)
commit97f17c049058572fb59a72c5feed11b766973bb4
treeadd7fd1b689406f8e91200c961c5ff38e527de22
parentb8094f8a18fd0df910866f948a6b91ef9e4c1ef8
parent427fa27cf46f49c374d380fca75826a8d8e0265b
Merge branch 'MDL-58220-master-fix4' of github.com/damyon/moodle