Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 01:50:33 +0000 (09:50 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 01:50:33 +0000 (09:50 +0800)

Trivial merge