Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 11:07:20 +0000 (11:07 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 11:07:20 +0000 (11:07 +0000)

Trivial merge