Merge branch 'MDL-55771_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:18:53 +0000 (10:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:18:53 +0000 (10:18 +0100)
commit9dd516c432898d5cf0de94ceaa4ba9a2ba3d506e
tree235da9ab7647679127604d0f1318ef011bbbe3e7
parenta46f18743184d0901c83d0b14084b1ce9ed8e4e2
parent8354d12d393f89babdbe1a4c70ad33710e082444
Merge branch 'MDL-55771_master' of git://github.com/markn86/moodle