Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Sep 2011 15:24:48 +0000 (17:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Sep 2011 15:24:48 +0000 (17:24 +0200)

Trivial merge