Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 14:45:13 +0000 (00:45 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 14:45:13 +0000 (00:45 +1000)

Trivial merge