Merge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 00:44:08 +0000 (01:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 00:44:08 +0000 (01:44 +0100)
commit2e6bd88f3b25fcfe23ae92a53abe405b2d6b7f53
treefc477d47cf8322f952a3a6a605a221ed1f05bf14
parent42bdecde6de02c8b50950fc659ddc01b947787ff
parentcd138b26f1c3154a3f8b5818b71e6ab97eea4c67
Merge branch 'w07_MDL-26376_20_shib' of git://github.com/skodak/moodle