Merge branch 'MDL-57480-31' of https://github.com/snake/moodle into MOODLE_31_STABLE
commit3a5de34b0396293caeb09a1005d3eae898abba0d
authorDan Poltawski <dan@moodle.com>
Tue, 10 Jan 2017 08:40:13 +0000 (10 08:40 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Jan 2017 08:40:13 +0000 (10 08:40 +0000)
tree0ace22a25b41ac9e8d7a910aa064fa420f53d289
parent1910eaf25144b90149d86454cc4a02de19c5d8f1
parent8e2349f196b716d3e58071e563eb0666947fc2ec
Merge branch 'MDL-57480-31' of https://github.com/snake/moodle into MOODLE_31_STABLE