Merge branch 'w26_MDL-28163_m22_customfront' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 08:11:17 +0000 (10:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 08:11:17 +0000 (10:11 +0200)

Trivial merge