Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Nov 2014 10:15:06 +0000 (10:15 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Nov 2014 10:15:06 +0000 (10:15 +0000)

Trivial merge