Merge branch 'MDL-57080-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE
commit8dea0f4533882318c2e3725c0f429cfe8fe4a7cb
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:15:04 +0000 (2 12:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:15:04 +0000 (2 12:15 +0000)
treeb8b5b52515b1423f9b064337d5b7ff8acf7679ff
parent28bb924937265c039f14fdbd45cb40962cad164a
parent9a177e48f3cfbef8b97c30df55e181db4d60a928
Merge branch 'MDL-57080-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE