Merge branch 'mdl57668-moodle31' of https://github.com/tlock/moodle into MOODLE_31_STABLE
commit787e8978990088a113a29a8611b84d3e061d1f15
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:05:35 +0000 (23 12:05 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:05:35 +0000 (23 12:05 +0000)
tree9113fa093b0650180024c40fdaaf2036e6de5ca9
parentc3416269270d53b5800b093d8cd125086569da3f
parentdfbbb39a25618a49974fa914a7678b68cfe5e738
Merge branch 'mdl57668-moodle31' of https://github.com/tlock/moodle into MOODLE_31_STABLE