Merge branch 'MDL-55127_master-fix-everything' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 25 Aug 2016 09:26:21 +0000 (10:26 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 25 Aug 2016 09:26:21 +0000 (10:26 +0100)
commitbaa5375a0cbee05f50499e9c5ea5403a7bbd3579
tree3cebb1dc9dfd4c2b9a7ca16b90ab04e9c42c7889
parentc52d34b2553b03e5f1e686cdb08e28b752ae9eb3
parentfa90f529867abf9036b9d9f3d5bb4e7f9e8a5d06
Merge branch 'MDL-55127_master-fix-everything' of git://github.com/dmonllao/moodle