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)
commitc357b5c6e0e3c203351d18124ee541a06281f7a1
treec84c9ccd308d2f8daaf89b7943900aad8871747d
parenteab044a083f01d267cf53545251fcb4123eb7c81
parent988fc20eef250dd9245cc6ccd17d529afadb7f37
Merge branch 'w31_MDL-28630_m22_cookie' of git://github.com/skodak/moodle