Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 14:12:58 +0000 (15:12 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 14:12:58 +0000 (15:12 +0100)
commit38a6ec6a3a9acda58097fec56a887c1523eaf2cc
tree1f553e18059b99f3d2b5bbebddca063f3247f278
parent89f5e43064245fd1c1f0e5aba16ebd948d88b448
parentdde6bdf973e030fa24851b68d989ab16f43398cf
Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/style/moodle.css