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)

Trivial merge