Merge branch 'MDL-57752_tracksessionip' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 13:53:10 +0000 (13:53 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Feb 2017 13:53:10 +0000 (13:53 +0000)

Trivial merge