Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 03:02:49 +0000 (15:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 03:02:49 +0000 (15:02 +1200)
1  2 
lib/setup.php

diff --cc lib/setup.php
Simple merge