-
https://github.com/phopkins/bootstrapMark Otto authored
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components Conflicts: docs/assets/css/bootstrap.css
d9759abe
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components Conflicts: docs/assets/css/bootstrap.css