Merge branch 'w26_MDL-28147_m22_minify' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 01:13:11 +0000 (03:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 01:13:11 +0000 (03:13 +0200)

Trivial merge