Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 22:24:13 +0000 (10:24 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Apr 2013 22:24:13 +0000 (10:24 +1200)
commitfdba83df89e7888736e3dbd736feae01e20e62f1
tree00c7aa337164a88a834c9ad8a518eda791ca7505
parent48fce3678dc273fdcc3b6254598c926b232c59f8
parentb72d78d847126bf8ffac4eff9cb2589c64e8745f
Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
theme/bootstrapbase/style/moodle.css