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)
commit2ecaec9bb6e37c463cc36fdf452dde41dee3d70c
treefe85a5812a06794b4b34eb63caeb27f31a5d8658
parentbf6181d451daab9a13ab620c9fa15be1c1d63582
parent8d773a885e8216ccff524fec7f6be64fe92adade
Merge branch 'MDL-41658_master' of git://github.com/kordan/moodle
theme/canvas/style/core.css