-
git://github.com/badcarl/bootstrapJacob Thornton authored
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document Conflicts: js/bootstrap-carousel.js
7f3b94c4
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document Conflicts: js/bootstrap-carousel.js