Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Mar 2016 06:40:05 +0000 (14:40 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Mar 2016 06:40:05 +0000 (14:40 +0800)
commitc0c26e5e69b5e14853ef386983f837cb15e64b9f
tree5c9f93b94f8fe50e21c9543c42b16a901f6db3bc
parentf87fcf42eef9215e473c9f2e2c66611f0865af82
parent54285c3ff52183a46d76f0852f86163680ffcc24
Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle