Merge branch 'w15_MDL-32293_m23_timeout' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:43:08 +0000 (10:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:43:08 +0000 (10:43 +1200)

Trivial merge