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)
commit3111b66fbde39313a60c2ee4be35a599a765597a
tree6d36cea946245fae201d52c87d2e721a79984d99
parentbcc4dc3eabde8d77074ae74f181278807204f348
parent89e9321f96dcd1c61f051723b1ec0ee29f609347
Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle