Merge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 07:00:08 +0000 (15:00 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 07:00:08 +0000 (15:00 +0800)
1  2 
theme/sky_high/style/admin.css

Simple merge