Merge branch 'MDL-41658_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:42:40 +0000 (09:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 21:42:40 +0000 (09:42 +1200)
1  2 
theme/canvas/style/core.css

Simple merge