Merge branch 'w47_MDL-36211_m24_sesslocking' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:56:44 +0000 (11:56 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:56:44 +0000 (11:56 +0800)

Trivial merge