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)
commit610cc5c3838433d504b969e27be5811b59780ece
treeeafb7810a7dcc8c4ff7544e454ac12ca6d3b83ad
parent761a000f7353aaf9d8f4c60d9943e85549ffc212
parent656749c18a83de0070f3729ab2559303dc2bd9f1
Merge branch 'w28_MDL-28363_m22_dimmed' of git://github.com/skodak/moodle