Merge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 10:27:35 +0000 (11:27 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:56 +0000 (09:24 +0100)
commitab8ef7540605e297adbd08cd7b69ee9e416efbfc
tree011bd42054a74d70ad7b37f7c6ae55875b816a54
parent941b7256938f2b668d161e6f2f657fa84c2e7a7e
parenteb55f72d6323c0cb162f52f9866facd5e7709309
Merge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle