Merge branch 'w07_MDL-26379_20_minify' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Feb 2011 23:56:02 +0000 (00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Feb 2011 23:56:02 +0000 (00:56 +0100)

Trivial merge