Merge branch 'wip-MDL-39748-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 06:16:31 +0000 (14:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 06:16:31 +0000 (14:16 +0800)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge