Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 23:52:22 +0000 (12:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Dec 2013 23:52:22 +0000 (12:52 +1300)
commit69f86e87a7e897f2ae5e67f850a5e978b61dd15e
tree854ae3749bbcd59df7507cdde34dfddec8797f48
parentc4edcce3ac31c6dc3f592a038aa746535fa253ce
parentce65578510dc70c5d6d80db334ed1f0a0279ab39
Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle
theme/bootstrapbase/style/moodle.css