Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	docs/assets/css/bootstrap.css

diff --cc docs/assets/css/bootstrap.css
index 176238fc66bc1f587d160d275c2d5c151e9aadb9,5ebfba675c9986af2c8bea719c837617e13cc1f6..0a45b94a39248b7cc7c0f705ec42229040b8b1a6
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Fri Jan 27 14:44:00 PST 2012
 - * Date: Fri Jan 27 14:21:03 PST 2012
++ * Date: Fri Jan 27 14:44:44 PST 2012
   */
  article,
  aside,

diff --cc docs/assets/img/glyphicons-halflings-white.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689
new file mode 100644 (file)
Binary files differ

diff --cc docs/assets/img/glyphicons-halflings.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..92d4445dfd0af414835467132cf50c7c38a303af
new file mode 100644 (file)
Binary files differ