Merge branch 'master' of http://git.local.twitter.com/bootstrap

Conflicts:
	lib/bootstrap.less

diff --cc lib/bootstrap.less
index 4c69ef86dea19a3cafda88288548c20cd98b5eb3,a2b09142507e8eadbcd0f68d2bc56c8aa53aa966..834d95080359070069e14b51c8efb6886d2ab752
--- 1/lib/bootstrap.less
--- 2/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@@ -1,15 -1,14 +1,14 @@@
-  /*!
-   * Bootstrap v0.0.1
-   *
-   * Copyright 2011 Twitter, Inc
-   * Licensed under the Apache License v2.0
-   * http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Made with love by two broheims, @mdo and @fat
-   * Date: {{ date }}
-   */
- 
 -/*
++/*!
+  * Bootstrap v1.0.0
+  *
+  * Copyright 2011 Twitter, Inc
+  * Licensed under the Apache License v2.0
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Designed and built with all the love in the world @twitter by @mdo and @fat.
++ * Date: {{ date }}
+  */
  
 -
  // CSS Reset
  @import "reset.less";