Merge branch 'w33_MDL-28929_m22_themeplaceholders' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 14:24:21 +0000 (16:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 14:24:21 +0000 (16:24 +0200)

Trivial merge