Merge branch 'MDL-55320-fix' of https://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 24 Aug 2016 07:20:57 +0000 (08:20 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 24 Aug 2016 07:20:57 +0000 (08:20 +0100)
commitc46077284ae6232c57a5234ecb49178148ef4ac6
tree0bfab9658cebb7201d9e0d92fad5a029e2faaa9d
parent8497f5ece9f4cf25a03df900ebcb4ba796341bd3
parent21575ea31c7fe621574400234b2485b3d2391f20
Merge branch 'MDL-55320-fix' of https://github.com/lameze/moodle