Adds AMD to bootstraps js files
Merge branch 'master' of https://github.com/twitter/bootstrap
Merge branch 'master' of https://github.com/twitter/bootstrap
Added Medias code and documentation

Added media.less and edited bootstrap.less and responsive.less to manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Added Medias code and documentation

Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component

Conflicts:
	docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
Merge branch 'master' of https://github.com/twitter/bootstrap

Conflicts:
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
Merge branch 'master' of https://github.com/twitter/bootstrap
Merge branch 'master' of https://github.com/twitter/bootstrap

Conflicts:
	js/bootstrap-scrollspy.js
	js/bootstrap-typeahead.js
Do not force white icons in active tab links

Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
version bump to get this started
rebuild after merge
Merge branch 'spantaleev-patch-1' into 2.1.2-wip
fixes #4996: incorrect border radius on a table
Fix small documentatio typos.
Modified the file to conform to bootstrap standards and fix an IE7 css selector issue

Signed-off-by: Giuliano Velli <giuliano@giusi.org>
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
remove offset margin in row-fluid mobile layout
fixes #5010: .pager span selector should be scoped to immediate children only
Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos