Merge branch 'w27_MDL-28280_m22_usesid' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 10:01:34 +0000 (12:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 10:01:34 +0000 (12:01 +0200)

Trivial merge