Merge branch 'MDL-56693_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 14:25:20 +0000 (14:25 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 14:25:20 +0000 (14:25 +0000)
commitb3fd942b52da4b9b6188a52c78ca2621d44117ea
treed3ece33c6c4a59165b62dae530446409f2409cc8
parentcd4a6b8b0bca159d3abb1468794ed5a074c5b701
parentf2e599d51cf5e0e8144dae2ea46cd3c6f6b5bb62
Merge branch 'MDL-56693_master' of git://github.com/dmonllao/moodle